From 0b542fab2c1ce2de32e9199610f76efc78e026fe Mon Sep 17 00:00:00 2001 From: JustOff Date: Tue, 26 Sep 2017 21:08:30 +0300 Subject: [PATCH] Improve names consistency --- browser/branding/shared/branding.mozbuild | 4 ++-- browser/branding/shared/pref/uaoverrides.inc | 4 ++-- config/compatversion.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild index 431c374a54..161c5c9377 100644 --- a/browser/branding/shared/branding.mozbuild +++ b/browser/branding/shared/branding.mozbuild @@ -44,5 +44,5 @@ elif CONFIG['MOZ_WIDGET_GTK']: DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] -DEFINES['GRE_VERSION'] = CONFIG['MOZILLA_UAVERSION'] -DEFINES['GK_VERSION'] = CONFIG['MOZILLA_COMPATVERSION'] \ No newline at end of file +DEFINES['MOZILLA_UAVERSION'] = CONFIG['MOZILLA_UAVERSION'] +DEFINES['MOZILLA_COMPATVERSION'] = CONFIG['MOZILLA_COMPATVERSION'] \ No newline at end of file diff --git a/browser/branding/shared/pref/uaoverrides.inc b/browser/branding/shared/pref/uaoverrides.inc index 242245040c..b5332ddeb9 100644 --- a/browser/branding/shared/pref/uaoverrides.inc +++ b/browser/branding/shared/pref/uaoverrides.inc @@ -2,12 +2,12 @@ #define GUAO_PREF general.useragent.override -// GRE_VERSION is taken from CONFIG['MOZILLA_UAVERSION'] +#define GRE_VERSION @MOZILLA_UAVERSION@ #define GRE_VERSION_SLICE Goanna/@GRE_VERSION@ #define GRE_DATE_SLICE Goanna/20170101 #define PM_SLICE PaleMoon/@MOZ_APP_VERSION@ -// GK_VERSION is defined in config/compatversion.txt +#define GK_VERSION @MOZILLA_COMPATVERSION@ #define GK_SLICE Gecko/20100101 #define FX_SLICE Firefox/@GK_VERSION@ diff --git a/config/compatversion.txt b/config/compatversion.txt index 4434246411..83e8020e0c 100644 --- a/config/compatversion.txt +++ b/config/compatversion.txt @@ -3,7 +3,7 @@ # # x.x # -# Referenced by nsHttpHandler.cpp, branding.mozbuild. +# Referenced by nsHttpHandler.cpp, uaoverrides.inc. #-------------------------------------------------------- 52.9