Fixed workaround made in https://reviews.llvm.org/D51694

[AndreyChurbanov]

Summary

Kelvin Li suggested solution for using long name with long kind name in the Fortran header file - omit optional "kind=" part of the kind-selector.
This patch fixes the workarount I used earlier (use shorter kind name that is currently has the same value, but theoretically can be changed somewhen in future).

Also removed the "kind=" for surrounded constants (not sure if we should delete it everywhere??).

[hbae]

LGTM.

runtime/src/include/50/omp_lib.h.var

!
       parameter(omp_control_tool_start=1)
       integer(kind=omp_control_tool_kind)omp_control_tool_pause
       parameter(omp_control_tool_pause=2)
       integer(kind=omp_control_tool_kind)omp_control_tool_flush
       parameter(omp_control_tool_flush=3)
       integer(kind=omp_control_tool_kind)omp_control_tool_end
       parameter(omp_control_tool_end=4)
 
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_notool
+      integer(omp_control_tool_result_kind)omp_control_tool_notool
       parameter(omp_control_tool_notool=-2)
-      integer(kind=omp_integer_kind)omp_control_tool_nocallback
+      integer(omp_control_tool_result_kind)omp_control_tool_nocallback
       parameter(omp_control_tool_nocallback=-1)
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_success
+      integer(omp_control_tool_result_kind)omp_control_tool_success
       parameter(omp_control_tool_success=0)
-      integer(kind=omp_control_tool_result_kind)omp_control_tool_ignored
+      integer(omp_control_tool_result_kind)omp_control_tool_ignored
       parameter(omp_control_tool_ignored=1)
 
       integer(kind=omp_allocator_kind)omp_null_allocator
       parameter(omp_null_allocator=0)
       integer(kind=omp_allocator_kind)omp_default_mem_alloc
       parameter(omp_default_mem_alloc=1)
       integer(kind=omp_allocator_kind)omp_large_cap_mem_alloc
       parameter(omp_large_cap_mem_alloc=2)