Commit a7cfad09 authored by Ben Avison's avatar Ben Avison

Resync with allocations database, and a warning fix

Detail:
  * Extra filetype for Windows .CUR files
  * Warning about Hdr:Wimp being included before Hdr:Services was mistakenly
    being generated every time both files were included, in any order. This
    is because it tested Service_WimpToolSpritesChanged, but that's declared
    using the # operator, so it is valid for forward as well as backward
    references. Changed it to test on a variable, which is only valid for
    backward references (see corresponding change to Wimp 5.46).
Admin:
  Tested the warning bugfix with the BASIC module, which uses both headers.


Version 2.46. Tagged as 'HdrSrc-2_46'
parent 291e8740
/* (2.45)
/* (2.46)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.45
#define Module_MajorVersion_CMHG 2.46
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Sep 2014
#define Module_Date_CMHG 24 Sep 2014
#define Module_MajorVersion "2.45"
#define Module_Version 245
#define Module_MajorVersion "2.46"
#define Module_Version 246
#define Module_MinorVersion ""
#define Module_Date "16 Sep 2014"
#define Module_Date "24 Sep 2014"
#define Module_ApplicationDate "16-Sep-14"
#define Module_ApplicationDate "24-Sep-14"
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "2.45"
#define Module_HelpVersion "2.45 (16 Sep 2014)"
#define Module_LibraryVersionInfo "2:45"
#define Module_FullVersion "2.46"
#define Module_HelpVersion "2.46 (24 Sep 2014)"
#define Module_LibraryVersionInfo "2:46"
......@@ -826,6 +826,10 @@ FileType_OOXMLDoc_Name SETS "MSWordX"
FileType_MPO EQU &00000A7B
FileType_MPO_Name SETS "MPO"
GBLS FileType_Translator_CUR_Name
FileType_Translator_CUR EQU &000006A5
FileType_Translator_CUR_Name SETS "CUR"
GBLS FileType_Translator_BMP_Name
FileType_Translator_BMP EQU &0000069C
FileType_Translator_BMP_Name SETS "BMP"
......
......@@ -232,7 +232,7 @@ Service_ADFSPoduleIDEDying # 1 ; &10802 tells ADFS podule is dy
^ &20100 ; SCSIDriver Service calls
SCSIDriverService # 64
[ :DEF: Service_WimpToolSpritesChanged
[ :DEF: Included_Hdr_Wimp
! 0, "Hdr:Wimp included before Hdr:Services - this is deprecated and will stop working soon", 1
|
WimpService * &400C0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment