summaryrefslogtreecommitdiff
path: root/compiler/msgidx.inc
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-11-11 20:55:03 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-11-11 20:55:03 +0000
commit7395f4ec4653303ad8cf10683e06ef0062e0a965 (patch)
tree8da67ba0fe208363ce5f61abc248d4f8aa426ec3 /compiler/msgidx.inc
parent4888e7e1cd2cff9a2c01d7641450ac77f2abe932 (diff)
downloadfpc-7395f4ec4653303ad8cf10683e06ef0062e0a965.tar.gz
* patch by Cyrax: forbid to use heaptrc and valgrind at the same time, resolves #36529
* load cmem before line* units as they might allocate memory git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@47390 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/msgidx.inc')
-rw-r--r--compiler/msgidx.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index d2f6fda831..10069a8a8d 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -1081,6 +1081,7 @@ const
option_invalid_target_architecture=11059;
option_features_only_for_system_unit=11060;
option_debug_info_requires_external_linker=11061;
+ option_valgrind_heaptrc_mismatch=11062;
wpo_cant_find_file=12000;
wpo_begin_processing=12001;
wpo_end_processing=12002;
@@ -1134,9 +1135,9 @@ const
option_info=11024;
option_help_pages=11025;
- MsgTxtSize = 86485;
+ MsgTxtSize = 86544;
MsgIdxMax : array[1..20] of longint=(
28,107,360,130,99,63,145,36,223,68,
- 62,20,30,1,1,1,1,1,1,1
+ 63,20,30,1,1,1,1,1,1,1
);