Changeset 510 for trunk/src/winmm


Ignore:
Timestamp:
Aug 16, 1999, 6:28:05 PM (26 years ago)
Author:
sandervl
Message:

Makefile changes & initterm.cpp no longer calls c/c++ library init & termination functions (should only be done in odincrt.dll)

Location:
trunk/src/winmm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/winmm/initterm.cpp

    r120 r510  
    1 /* $Id: initterm.cpp,v 1.3 1999-06-19 10:54:48 sandervl Exp $ */
     1/* $Id: initterm.cpp,v 1.4 1999-08-16 16:28:04 sandervl Exp $ */
    22
    33/*
    … …  
    3939extern "C" {
    4040void IRTMidiShutdown();  // IRTMidi shutdown routine
    41 
    42 /*-------------------------------------------------------------------*/
    43 /* _CRT_init is the C run-time environment initialization function.  */
    44 /* It will return 0 to indicate success and -1 to indicate failure.  */
    45 /*-------------------------------------------------------------------*/
    46 int CDECL CRT_init(void);
    47 /*-------------------------------------------------------------------*/
    48 /* _CRT_term is the C run-time environment termination function.     */
    49 /* It only needs to be called when the C run-time functions are      */
    50 /* statically linked.                                                */
    51 /*-------------------------------------------------------------------*/
    52 void CDECL CRT_term(void);
    53 void CDECL _ctordtorInit( void );
    54 void CDECL _ctordtorTerm( void );
    5541}
    5642
    … …  
    8874      case 0 :
    8975
    90          /*******************************************************************/
    91          /* The C run-time environment initialization function must be      */
    92          /* called before any calls to C run-time functions that are not    */
    93          /* inlined.                                                        */
    94          /*******************************************************************/
    95 
    96          if (CRT_init() == -1)
    97             return 0UL;
    98          _ctordtorInit();
    99 
    10076         CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    10177
    … …  
    10581         /*******************************************************************/
    10682
    107          rc = DosExitList(0x0000FF00|EXLST_ADD, cleanup);
     83         rc = DosExitList(0x0000F000|EXLST_ADD, cleanup);
    10884         if(rc)
    10985                return 0UL;
    … …  
    128104   auxOS2Close();  /* SvL: Close aux device if necessary */
    129105   IRTMidiShutdown;  /* JT: Shutdown RT Midi subsystem, if running. */
    130    _ctordtorTerm();
    131    CRT_term();
    132106   DosExitList(EXLST_EXIT, cleanup);
    133107   return ;

  • trunk/src/winmm/makefile

    r457 r510  
    1 # $Id: makefile,v 1.6 1999-08-09 21:03:16 phaller Exp $
     1# $Id: makefile,v 1.7 1999-08-16 16:28:04 sandervl Exp $
    22
    33#
    … …  
    3131
    3232$(TARGET).dll: $(OBJS) $(TARGET).def
    33         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def \
     33        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    3434              $(PDWIN32_LIB)/pmwinx.lib mmpm2.lib  \
    3535              $(PDWIN32_LIB)/kernel32.lib \
    3636              $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
    3737              OS2386.LIB \
    38               cppom30.lib
    39 # @@@PH CPPOM30.LIB DOES NOT BELONG here, it's a temporary hack!
    40 
     38              cppom30O.lib
    4139        $(CP) $@ $(PDWIN32_BIN)
    4240
Note: See TracChangeset for help on using the changeset viewer.