diff options
author | wtc%netscape.com <devnull@localhost> | 1999-03-17 21:25:08 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 1999-03-17 21:25:08 +0000 |
commit | 45ef5e9ceccb997b2de55b6ef0d3af5b7bd0a372 (patch) | |
tree | 9dd61e4cf36dabcc26657bd00acec6d97c9c8048 | |
parent | 806798a3fbc4bebb165e4d406638ad891c8ed3d9 (diff) | |
download | nspr-hg-45ef5e9ceccb997b2de55b6ef0d3af5b7bd0a372.tar.gz |
NSPR library name change (libnspr21 ==> libnspr3) and
plevent.c.
-rw-r--r-- | config/module.df | 2 | ||||
-rw-r--r-- | config/rules.mk | 4 | ||||
-rw-r--r-- | lib/ds/Makefile | 4 | ||||
-rw-r--r-- | lib/ds/plevent.c | 61 | ||||
-rw-r--r-- | lib/libc/src/Makefile | 4 | ||||
-rw-r--r-- | lib/prstreams/Makefile | 6 | ||||
-rw-r--r-- | lib/prstreams/tests/testprstrm/Makefile | 11 | ||||
-rw-r--r-- | lib/tests/Makefile | 14 | ||||
-rw-r--r-- | lib/tests/windows/makefile | 6 | ||||
-rw-r--r-- | pr/tests/Makefile | 9 |
10 files changed, 49 insertions, 72 deletions
diff --git a/config/module.df b/config/module.df index c43afbb3..c0d745be 100644 --- a/config/module.df +++ b/config/module.df @@ -20,4 +20,4 @@ # A module is also called a component or a subsystem. MOD_NAME = nspr20 -MOD_VERSION = 21 +MOD_VERSION = 3 diff --git a/config/rules.mk b/config/rules.mk index bded985e..3dd2f094 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -68,10 +68,10 @@ ifdef LIBRARY_NAME ifeq ($(OS_ARCH), WINNT) # -# Win16 and OS/2 require library names conforming to the 8.3 rule. +# Win95, Win16, and OS/2 require library names conforming to the 8.3 rule. # other platforms do not. # -ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET))) +ifeq (,$(filter-out WIN95 WIN16 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) diff --git a/lib/ds/Makefile b/lib/ds/Makefile index 0a2021c6..fde8cae4 100644 --- a/lib/ds/Makefile +++ b/lib/ds/Makefile @@ -56,7 +56,11 @@ DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/ds.res RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc OS_LIBS = user32.lib +ifeq ($(OS_TARGET),WIN95) +EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +else EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +endif ifdef MOZ_DEBUG ifdef GLOWCODE diff --git a/lib/ds/plevent.c b/lib/ds/plevent.c index b221a88a..3832fd20 100644 --- a/lib/ds/plevent.c +++ b/lib/ds/plevent.c @@ -96,8 +96,6 @@ static void _md_CreateEventQueue( PLEventQueue *eventQueue ); #if defined(_WIN32) || defined(WIN16) || defined(XP_OS2) -PLEventQueue * _pr_MainEventQueue; - #if defined(XP_OS2) ULONG _pr_PostEventMsgId; static char *_pr_eventWindowClass = "NSPR:EventWindow"; @@ -641,15 +639,8 @@ _pl_CleanupNativeNotifier(PLEventQueue* self) static PRStatus _pl_NativeNotify(PLEventQueue* self) { - /* - ** Post a message to the NSPR window on the main thread requesting - ** it to process the pending events. This is only necessary for the - ** main event queue, since the main thread is waiting for OS events. - */ - if (self == _pr_MainEventQueue ) { - PostMessage( self->eventReceiverWindow, _pr_PostEventMsgId, - (WPARAM)0, (LPARAM)self); - } + PostMessage( self->eventReceiverWindow, _pr_PostEventMsgId, + (WPARAM)0, (LPARAM)self); return PR_SUCCESS; }/* --- end _pl_NativeNotify() --- */ #endif @@ -794,13 +785,6 @@ BOOL WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved) #if defined(WIN16) || defined(_WIN32) || defined(XP_OS2) -PR_IMPLEMENT(PLEventQueue *) - PL_GetMainEventQueue( void ) -{ - PR_ASSERT( _pr_MainEventQueue ); - - return _pr_MainEventQueue; -} #ifdef XP_OS2 MRESULT EXPENTRY _md_EventReceiverProc(HWND hwnd, ULONG uMsg, MPARAM wParam, MPARAM lParam) @@ -814,19 +798,15 @@ _md_EventReceiverProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { if (_pr_PostEventMsgId == uMsg ) { - PREventQueue *queue = (PREventQueue *)lParam; - - PR_ASSERT(queue == PL_GetMainEventQueue()); - if (queue == PL_GetMainEventQueue()) - { - PR_ProcessPendingEvents(queue); + PREventQueue *queue = (PREventQueue *)lParam; + + PR_ProcessPendingEvents(queue); #ifdef XP_OS2 return MRFROMLONG(TRUE); #else return TRUE; #endif } - } return DefWindowProc(hwnd, uMsg, wParam, lParam); } @@ -850,41 +830,10 @@ static PRStatus InitEventLib( void ) return PR_SUCCESS; } /* end InitWinEventLib() */ - -PR_IMPLEMENT(void) - PL_InitializeEventsLib( char *name ) -{ - PLEventQueue *eventQueue; - - PR_CallOnce( &once, InitEventLib ); - - PR_Lock( initLock ); - if ( isInitialized == PR_FALSE ) - { - isInitialized = PR_TRUE; - - eventQueue = PL_CreateEventQueue( name, PR_GetCurrentThread() ); - _pr_MainEventQueue = eventQueue; - } - PR_Unlock( initLock ); - - PR_LOG(event_lm, PR_LOG_DEBUG,("PL_InitializeeventsLib(). Done!\n")); - return; -} #endif /* Win16, Win32, OS2 */ #if defined(_WIN32) || defined(WIN16) || defined(XP_OS2) -PR_IMPLEMENT(HWND) - PR_GetEventReceiverWindow( void ) -{ - HWND eventReceiver = _pr_MainEventQueue->eventReceiverWindow; - - if( eventReceiver != 0 ) - return eventReceiver; - else - return 0; -} #endif #if defined(_WIN32) || defined(WIN16) diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile index cca74076..34e82da2 100644 --- a/lib/libc/src/Makefile +++ b/lib/libc/src/Makefile @@ -63,7 +63,11 @@ else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plc.res RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc +ifeq ($(OS_TARGET),WIN95) +EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib +else EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib +endif ifdef MOZ_DEBUG ifdef GLOWCODE diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile index 706de958..1a9b9ff8 100644 --- a/lib/prstreams/Makefile +++ b/lib/prstreams/Makefile @@ -59,7 +59,11 @@ ifeq ($(OS_ARCH), WINNT) RES=$(OBJDIR)/prstrms.res RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc OS_LIBS = user32.lib - EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib + ifeq ($(OS_TARGET), WIN95) + EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib + else + EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib + endif endif else ifeq ($(OS_ARCH), AIX) diff --git a/lib/prstreams/tests/testprstrm/Makefile b/lib/prstreams/tests/testprstrm/Makefile index 64b0ceed..91869904 100644 --- a/lib/prstreams/tests/testprstrm/Makefile +++ b/lib/prstreams/tests/testprstrm/Makefile @@ -54,9 +54,14 @@ ifeq ($(OS_TARGET), WIN16) LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib else -LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) -LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) + LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + ifeq ($(OS_TARGET), WIN95) + LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX) + else + LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX) + endif endif endif diff --git a/lib/tests/Makefile b/lib/tests/Makefile index af284287..4d8a54a9 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -59,10 +59,16 @@ ifeq ($(OS_TARGET), WIN16) LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib else -LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) -LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) -LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX) + LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -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_SUFFIX) + else + LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX) + endif endif endif diff --git a/lib/tests/windows/makefile b/lib/tests/windows/makefile index f0bea9bf..a2230624 100644 --- a/lib/tests/windows/makefile +++ b/lib/tests/windows/makefile @@ -35,9 +35,9 @@ ifeq ($(OS_TARGET), WIN16) else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).lib + 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) diff --git a/pr/tests/Makefile b/pr/tests/Makefile index fbd637cf..b0a9af4c 100644 --- a/pr/tests/Makefile +++ b/pr/tests/Makefile @@ -188,8 +188,13 @@ else endif else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + ifeq ($(OS_TARGET), WIN95) + LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) + else + LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) + LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + endif ifdef PROFILE LDOPTS += -PROFILE -MAP endif # profile |