Bugzilla bug #17101: move plevent.h and plevent.c from mozilla/nsprpub

to mozilla/xpcom/threads by landing the PLEVENT_MOVE_BRANCH.
Modified files: nsprpub/lib/ds/MANIFEST, nsprpub/lib/ds/Makefile,
nsprpub/lib/ds/Makefile.in, nsprpub/macbuild/NSPR20PPC.mcp,
nsprpub/pr/include/obsolete/protypes.h,
xpcom/macbuild/xpcomPPC.mcp, xpcom/threads/MANIFEST,
xpcom/threads/Makefile.in, xpcom/threads/makefile.win,
xpcom/threads/plevent.h

nsprpub/lib/ds/MANIFEST

@@ -4,5 +4,4 @@
 
 plarenas.h
 plarena.h
-plevent.h
 plhash.h

nsprpub/lib/ds/Makefile

@@ -32,7 +32,6 @@ INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include
 
 CSRCS = \
 	plarena.c \
-	plevent.c \
 	plhash.c \
 	plvrsion.c \
 	$(NULL)
@@ -40,7 +39,6 @@ CSRCS = \
 HEADERS = \
 	plarenas.h \
 	plarena.h \
-	plevent.h \
 	plhash.h \
 	$(NULL)
 

nsprpub/lib/ds/Makefile.in

@@ -39,7 +39,6 @@ INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include
 
 CSRCS = \
 	plarena.c \
-	plevent.c \
 	plhash.c \
 	plvrsion.c \
 	$(NULL)
@@ -47,7 +46,6 @@ CSRCS = \
 HEADERS = \
 	plarenas.h \
 	plarena.h \
-	plevent.h \
 	plhash.h \
 	$(NULL)
 

nsprpub/pr/include/obsolete/protypes.h

@@ -132,34 +132,6 @@ typedef PRWord prword_t;
 #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

xpcom/threads/MANIFEST

@@ -1,3 +1,4 @@
 nsAutoLock.h
 nsIEventQueue.h 
 nsIEventQueueService.h
+plevent.h

xpcom/threads/Makefile.in

@@ -31,6 +31,10 @@ LIBRARY_NAME	= xpcomthreads_s
 
 REQUIRES	= xpcom
 
+CSRCS		= \
+		plevent.c \
+		$(NULL)
+
 CPPSRCS		= \
 		nsAutoLock.cpp \
 		nsEventQueue.cpp \
@@ -42,6 +46,7 @@ EXPORTS		= \
 		nsAutoLock.h \
 		nsIEventQueue.h \
 		nsIEventQueueService.h \
+		plevent.h \
 		$(NULL)			
 
 XPIDLSRCS	= \

xpcom/threads/makefile.win

@@ -31,6 +31,7 @@ EXPORTS =                      \
         nsAutoLock.h           \
         nsIEventQueue.h        \
         nsIEventQueueService.h \
+        plevent.h              \
         $(NULL)			
 
 NO_XPT_GEN=1
@@ -53,6 +54,10 @@ LINCS =                   \
 
 LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
 
+C_OBJS =                                    \
+        .\$(OBJDIR)\plevent.obj             \
+        $(NULL)
+
 CPP_OBJS =                                  \
         .\$(OBJDIR)\nsAutoLock.obj          \
         .\$(OBJDIR)\nsEventQueue.obj        \

xpcom/threads/plevent.h

@@ -162,8 +162,8 @@ to ensure that all events are removed from the queue for that owner,
 and to ensure that no more events will be delivered for that owner.
 **********************************************************************/
 
-#ifndef prevent_h___
+#ifndef plevent_h___
-#define prevent_h___
+#define plevent_h___
 
 #include "prtypes.h"
 #include "prclist.h"
@@ -492,6 +492,42 @@ PR_EXTERN(HWND)
 
 #endif /* XP_PC */
 
+#if defined(NO_NSPR_10_SUPPORT)
+#else
+/********* ???????????????? FIX ME       ??????????????????????????? *****/
+/********************** Some old definitions *****************************/
+
+/* 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
+
+/********* ????????????? End Fix me ?????????????????????????????? *****/
+#endif /* NO_NSPR_10_SUPPORT */
+
 PR_END_EXTERN_C
 
-#endif /* prevent_h___ */
+#endif /* plevent_h___ */