Merge svn changes up to r26587

Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c

2 files changed, 8 insertions, 7 deletions

diff --git a/loader/qtx/list.c b/loader/qtx/list.c
index 5c782fc05a..34e93dccc5 100644
--- a/loader/qtx/list.c
+++ b/loader/qtx/list.c
@@ -8,6 +8,7 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
+#include "ldt_keeper.h"
 
 char* get_path(const char* x){  return strdup(x);}
 void* LoadLibraryA(char* name);
@@ -51,8 +52,7 @@ int main(int argc, char *argv[]){
     desc.componentFlags=0;
     desc.componentFlagsMask=0;
     
-    printf("Count = %d\n",CountComponents(&desc));
-    
-    Restore_LDT_Keeper();
+    printf("Count = %ld\n",CountComponents(&desc));
+
     exit(0);
 }
diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c
index d17c3138d9..88dc032d33 100644
--- a/loader/qtx/qtxload.c
+++ b/loader/qtx/qtxload.c
@@ -4,6 +4,8 @@
 
 #include "qtxsdk/components.h"
 #include "qtxsdk/select.h"
+#include "ldt_keeper.h"
+#include "mp_msg.h"
 
 /* ilyen egy sima komponens */
 ComponentResult ComponentDummy(
@@ -42,8 +44,8 @@ int main(int argc, char *argv[]){
     ComponentParameters *params;
     ComponentDescription desc;
     void *globals=NULL;
-    unsigned int esp=0;
-    int i;
+    //unsigned int esp=0;
+    //int i;
 
     mp_msg_init();
     //mp_msg_set_level(10);
@@ -120,8 +122,7 @@ int main(int argc, char *argv[]){
 
 //    for(i=0;i<0x00001837;i++)
 //	if(x_table[i]) printf("x_table[0x%X] = %p\n",i,x_table[i]);
-    
-    Restore_LDT_Keeper();
+
     exit(0);
     //return 0;
 }