fpdfsdk/include/javascript/JS_Define.h - Issue 802013002: Avoid duplicate definitions of JSCONST_n*Hash and QeTable variables.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: fpdfsdk/include/javascript/JS_Define.h

Issue 802013002: Avoid duplicate definitions of JSCONST_n*Hash and QeTable variables. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp ('K') | « core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp ('k') | fpdfsdk/src/javascript/global.cpp » ('j') | fpdfsdk/src/javascript/global.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: fpdfsdk/include/javascript/JS_Define.h

diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h

index 0821b6238ba83ccba69fbdc82ff9b0f371b0ae78..9a51f69c8170f15ffbc6d283d64b88f904171ae4 100644

--- a/fpdfsdk/include/javascript/JS_Define.h

+++ b/fpdfsdk/include/javascript/JS_Define.h

@@ -648,14 +648,14 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToJSValue())

#define CLASSNAME_DATE L"Date"

#define CLASSNAME_STRING L"v8::String"

-const unsigned int JSCONST_nStringHash = JS_CalcHash(VALUE_NAME_STRING,wcslen(VALUE_NAME_STRING));

-const unsigned int JSCONST_nNumberHash = JS_CalcHash(VALUE_NAME_NUMBER,wcslen(VALUE_NAME_NUMBER));

-const unsigned int JSCONST_nBoolHash = JS_CalcHash(VALUE_NAME_BOOLEAN,wcslen(VALUE_NAME_BOOLEAN));

-const unsigned int JSCONST_nDateHash = JS_CalcHash(VALUE_NAME_DATE,wcslen(VALUE_NAME_DATE));

-const unsigned int JSCONST_nObjectHash = JS_CalcHash(VALUE_NAME_OBJECT,wcslen(VALUE_NAME_OBJECT));

-const unsigned int JSCONST_nFXobjHash = JS_CalcHash(VALUE_NAME_FXOBJ,wcslen(VALUE_NAME_FXOBJ));

-const unsigned int JSCONST_nNullHash = JS_CalcHash(VALUE_NAME_NULL,wcslen(VALUE_NAME_NULL));

-const unsigned int JSCONST_nUndefHash = JS_CalcHash(VALUE_NAME_UNDEFINED,wcslen(VALUE_NAME_UNDEFINED));

+extern const unsigned int JSCONST_nStringHash;

+extern const unsigned int JSCONST_nNumberHash;

+extern const unsigned int JSCONST_nBoolHash;

+extern const unsigned int JSCONST_nDateHash;

+extern const unsigned int JSCONST_nObjectHash;

+extern const unsigned int JSCONST_nFXobjHash;

+extern const unsigned int JSCONST_nNullHash;

+extern const unsigned int JSCONST_nUndefHash;

static FXJSVALUETYPE GET_VALUE_TYPE(v8::Handle<v8::Value> p)

{