Skip to content

Commit e1d94d9

Browse files
committed
clib: update windows memory alloc/realloc flags
1 parent 3303ad4 commit e1d94d9

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

bld/hdr/watcom/stdlib.mh

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -442,37 +442,21 @@ _WCRTLINK extern unsigned *__get_psp_ptr( void );
442442
_WCRTLINK extern unsigned char *__get_osmode_ptr( void );
443443
_WCRTLINK extern int *__get_fmode_ptr( void );
444444
_WCRTLINK extern unsigned *__get_minreal_ptr( void );
445-
:segment DOS
446-
_WCRTLINK extern unsigned long *__get_win_alloc_flags_ptr( void );
447-
_WCRTLINK extern unsigned long *__get_win_realloc_flags_ptr( void );
448-
:endsegment
449445
#ifdef __FUNCTION_DATA_ACCESS
450446
#define _psp (*__get_psp_ptr())
451447
#define _osmode (*__get_osmode_ptr())
452448
#define _fmode (*__get_fmode_ptr())
453449
#define __minreal (*__get_minreal_ptr())
454-
:segment DOS
455-
#define __win_alloc_flags (*__get_win_alloc_flags_ptr())
456-
#define __win_realloc_flags (*__get_win_realloc_flags_ptr())
457-
:endsegment
458450
#elif defined(__SW_BR) || defined(_RTDLL)
459451
#define _psp _psp_br
460452
#define _osmode _osmode_br
461453
#define _fmode _fmode_br
462454
#define __minreal __minreal_br
463-
:segment DOS
464-
#define __win_alloc_flags __win_alloc_flags_br
465-
#define __win_realloc_flags __win_realloc_flags_br
466-
:endsegment
467455
#endif
468456
_WCRTDATA extern unsigned _WCDATA _psp; /* Program Segment Prefix */
469-
_WCRTDATA extern unsigned char _WCDATA _osmode; /* DOS_MODE or OS2_MODE */
457+
_WCRTDATA extern unsigned char _WCDATA _osmode; /* DOS_MODE or OS2_MODE */
470458
_WCRTDATA extern int _WCDATA _fmode; /* default file translation mode */
471459
_WCRTDATA extern unsigned _WCDATA __minreal; /* DOS4GW var for WLINK MINREAL option*/
472-
:segment DOS
473-
_WCRTDATA extern unsigned long _WCDATA __win_alloc_flags; /* Windows allocation flags */
474-
_WCRTDATA extern unsigned long _WCDATA __win_realloc_flags; /* Windows reallocation flags */
475-
:endsegment
476460

477461
#define DOS_MODE 0 /* Real Address Mode */
478462
#define OS2_MODE 1 /* Protected Address Mode */
@@ -523,14 +507,20 @@ _WCRTDATA extern unsigned char _WCDATA _osminor; /* O/S minor version # */
523507
_WCRTLINK extern unsigned char *__get_winmajor_ptr( void );
524508
_WCRTLINK extern unsigned char *__get_winminor_ptr( void );
525509
_WCRTLINK extern unsigned int *__get_winver_ptr( void );
510+
_WCRTLINK extern unsigned long *__get_win_alloc_flags_ptr( void );
511+
_WCRTLINK extern unsigned long *__get_win_realloc_flags_ptr( void );
526512
#ifdef __FUNCTION_DATA_ACCESS
527-
#define _winmajor (*__get_winmajor_ptr())
528-
#define _winminor (*__get_winminor_ptr())
529-
#define _winver (*__get_winver_ptr())
513+
#define _winmajor (*__get_winmajor_ptr())
514+
#define _winminor (*__get_winminor_ptr())
515+
#define _winver (*__get_winver_ptr())
516+
#define __win_alloc_flags (*__get_win_alloc_flags_ptr())
517+
#define __win_realloc_flags (*__get_win_realloc_flags_ptr())
530518
#endif
531-
_WCRTDATA extern unsigned char _WCDATA _winmajor; /* O/S major version # */
532-
_WCRTDATA extern unsigned char _WCDATA _winminor; /* O/S minor version # */
533-
_WCRTDATA extern unsigned int _WCDATA _winver; /* O/S version # */
519+
_WCRTDATA extern unsigned char _WCDATA _winmajor; /* Windows major version # */
520+
_WCRTDATA extern unsigned char _WCDATA _winminor; /* Windows minor version # */
521+
_WCRTDATA extern unsigned int _WCDATA _winver; /* Windows version # */
522+
_WCRTDATA extern unsigned long _WCDATA __win_alloc_flags; /* Windows allocation flags */
523+
_WCRTDATA extern unsigned long _WCDATA __win_realloc_flags; /* Windows reallocation flags */
534524
#elif defined( __NT__ )
535525
_WCRTLINK extern unsigned short *__get_osbuild_ptr( void );
536526
_WCRTLINK extern unsigned int *__get_osver_ptr( void );

docs/doc/lr/src/globdata.gml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,14 @@ This
448448
data item is a pointer to an array of wide character pointers to the
449449
wide character equivalents of the environment strings.
450450
.df __win_alloc_flags
451+
(Win16 only)
451452
.proto stdlib.h
452453
This
453454
.id unsigned long int
454455
variable contains the flags to be used when allocating memory in
455456
Windows.
456457
.df __win_realloc_flags
458+
(Win16 only)
457459
.proto stdlib.h
458460
This
459461
.id unsigned long int

0 commit comments

Comments
 (0)