From 994f05a34eccbdffcb44021e2735fe28b828f896 Mon Sep 17 00:00:00 2001
From: "warren%netscape.com" <warren%netscape.com>
Date: Wed, 15 Sep 1999 21:41:20 +0000
Subject: [PATCH] Making nsIThread nsIRunnable and nsIThreadPool idl
 interfaces.

---
 build/mac/NGLayoutBuildList.pm            |  1 +
 netwerk/protocol/file/src/nsFileChannel.h |  1 +
 xpcom/threads/MANIFEST                    |  3 ---
 xpcom/threads/MANIFEST_IDL                |  3 +++
 xpcom/threads/Makefile.in                 |  8 ++++----
 xpcom/threads/makefile.win                | 11 +++++++----
 6 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 xpcom/threads/MANIFEST_IDL

diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm
index 4cacfb7f2dd2..78a23c3f735c 100644
--- a/build/mac/NGLayoutBuildList.pm
+++ b/build/mac/NGLayoutBuildList.pm
@@ -362,6 +362,7 @@ sub BuildClientDist()
 	_InstallFromManifest(":mozilla:xpcom:base:MANIFEST_IDL",							"$distdirectory:idl:");
 	_InstallFromManifest(":mozilla:xpcom:io:MANIFEST_IDL",							"$distdirectory:idl:");
 	_InstallFromManifest(":mozilla:xpcom:ds:MANIFEST_IDL",							"$distdirectory:idl:");
+	_InstallFromManifest(":mozilla:xpcom:threads:MANIFEST_IDL",							"$distdirectory:idl:");
 	_InstallFromManifest(":mozilla:xpcom:components:MANIFEST_IDL",							"$distdirectory:idl:");
 
 	_InstallFromManifest(":mozilla:xpcom:base:MANIFEST",								"$distdirectory:xpcom:");
diff --git a/netwerk/protocol/file/src/nsFileChannel.h b/netwerk/protocol/file/src/nsFileChannel.h
index d9f023fce84f..739b455c8f3a 100644
--- a/netwerk/protocol/file/src/nsFileChannel.h
+++ b/netwerk/protocol/file/src/nsFileChannel.h
@@ -29,6 +29,7 @@
 #define STREAM_CONVERTER_HACK 
 
 #include "nsIFileChannel.h"
+#include "nsIRunnable.h"
 #include "nsIThread.h"
 #include "nsFileSpec.h"
 #include "prlock.h"
diff --git a/xpcom/threads/MANIFEST b/xpcom/threads/MANIFEST
index 6c0502ccf403..b0ce13248168 100644
--- a/xpcom/threads/MANIFEST
+++ b/xpcom/threads/MANIFEST
@@ -1,6 +1,3 @@
 nsAutoLock.h
 nsIEventQueue.h 
 nsIEventQueueService.h
-nsIThread.h
-nsIRunnable.h
-nsIThreadPool.h
diff --git a/xpcom/threads/MANIFEST_IDL b/xpcom/threads/MANIFEST_IDL
new file mode 100644
index 000000000000..e7cae3a6f9df
--- /dev/null
+++ b/xpcom/threads/MANIFEST_IDL
@@ -0,0 +1,3 @@
+nsIRunnable.idl
+nsIThread.idl
+nsIThreadPool.idl
diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in
index adbd2839cabf..a71cf62aa687 100644
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -28,7 +28,10 @@ LIBRARY_NAME = xpcomthreads_s
 
 MODULE = xpcom
 
-XPIDLSRCS =			\
+XPIDLSRCS =		  \
+	nsIThread.idl	  \
+        nsIThreadPool.idl \
+        nsIRunnable.idl	  \
 	$(NULL)
 
 CPPSRCS =				\
@@ -42,9 +45,6 @@ EXPORTS = \
 	nsAutoLock.h           \
 	nsIEventQueue.h        \
 	nsIEventQueueService.h \
-	nsIThread.h            \
-        nsIThreadPool.h        \
-        nsIRunnable.h          \
 	$(NULL)			
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/xpcom/threads/makefile.win b/xpcom/threads/makefile.win
index 7d6aba01e718..9052ef98d6b8 100644
--- a/xpcom/threads/makefile.win
+++ b/xpcom/threads/makefile.win
@@ -27,12 +27,15 @@ EXPORTS =                      \
         nsAutoLock.h           \
         nsIEventQueue.h        \
         nsIEventQueueService.h \
-        nsIThread.h            \
-        nsIThreadPool.h        \
-        nsIRunnable.h          \
         $(NULL)			
 
-XPIDLSRCS =               \
+NO_XPT_GEN=1
+XPIDL_MODULE = xpcom_thread
+
+XPIDLSRCS =                 \
+        .\nsIThread.idl     \
+        .\nsIThreadPool.idl \
+        .\nsIRunnable.idl   \
         $(NULL)
 
 ################################################################################