Remove (harmless) warnings about min/max in core applications

19 files changed, 47 insertions, 153 deletions

diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index a13292d5ab..024b20eadb 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -405,7 +405,7 @@ handle_timeout(State = #state{loader = inet}, Parent) ->
 efile_multi_get_file_from_port(State, ModFiles, Paths, Fun) ->
     Ref = make_ref(),
     %% More than 200 processes is no gain.
-    Max = min(200, erlang:system_info(thread_pool_size)),
+    Max = erlang:min(200, erlang:system_info(thread_pool_size)),
     efile_multi_get_file_from_port2(ModFiles, 0, Max, State, Paths, Fun, Ref, ok).
 
 efile_multi_get_file_from_port2([MF | MFs], Out, Max, State, Paths, Fun, Ref, Ret) when Out < Max ->
@@ -1189,9 +1189,6 @@ keyins(X, I, [Y | T]) when X < element(I,Y) -> [X,Y|T];
 keyins(X, I, [Y | T]) -> [Y | keyins(X, I, T)];
 keyins(X, _I, []) -> [X].
 
-min(X, Y) when X < Y -> X;
-min(_X, Y) -> Y.
-
 to_strs([P|Paths]) when is_atom(P) ->
     [atom_to_list(P)|to_strs(Paths)];
 to_strs([P|Paths]) when is_list(P) ->
diff --git a/lib/appmon/src/appmon.erl b/lib/appmon/src/appmon.erl
index 6f5d2824d2..2b38232833 100644
--- a/lib/appmon/src/appmon.erl
+++ b/lib/appmon/src/appmon.erl
@@ -838,7 +838,7 @@ draw_apps(GUI, [App | Apps], X, Lx0, N, GSObjs) ->
     %% Some necessary data
     {_Pid, AppName, _Descr} = App,
     Text = atom_to_list(AppName),
-    Width = max(8*length(Text)+10, ?wBTN),
+    Width = erlang:max(8*length(Text)+10, ?wBTN),
 
     %% Connect the application to the node label with a line
     %% Lx0 = leftmost X coordinate (above previous application button)
@@ -1009,9 +1009,6 @@ bcast(MNodes, Msg) ->
 		  end,
 		  MNodes).
 
-max(X, Y) when X>Y -> X;
-max(_, Y) -> Y.
-
 %% parse_nodes(MNodes) -> NodeApps
 %%   MNodes -> [#mnode{}]
 %%   NodeApps -> [{Node, Status, Apps}]
diff --git a/lib/appmon/src/appmon_info.erl b/lib/appmon/src/appmon_info.erl
index 4e36d3a13f..b5194692dd 100644
--- a/lib/appmon/src/appmon_info.erl
+++ b/lib/appmon/src/appmon_info.erl
@@ -807,24 +807,21 @@ load(Opts) ->
 	    
 	    case get_opt(load_scale, Opts) of
 		linear ->
-		    min(trunc(load_range()*(Td/Tot+Q/6)),
+		    erlang:min(trunc(load_range()*(Td/Tot+Q/6)),
 			load_range());
 		prog ->
-		    min(trunc(load_range()*prog(Td/Tot+Q/6)),
+		    erlang:min(trunc(load_range()*prog(Td/Tot+Q/6)),
 			load_range())
 	    end;
 	queue ->
 	    case get_opt(load_scale, Opts) of
 		linear ->
-		    min(trunc(load_range()*Q/6), load_range());
+		    erlang:min(trunc(load_range()*Q/6), load_range());
 		prog ->
-		    min(trunc(load_range()*prog(Q/6)), load_range())
+		    erlang:min(trunc(load_range()*prog(Q/6)), load_range())
 		end
     end.
 
-min(X,Y) when X<Y -> X;
-min(_,Y)->Y.
-
 
 %%
 %% T shall be within 0 and 0.9 for this to work correctly
diff --git a/lib/appmon/src/appmon_place.erl b/lib/appmon/src/appmon_place.erl
index 5a6ae6aa48..29038c84bd 100644
--- a/lib/appmon/src/appmon_place.erl
+++ b/lib/appmon/src/appmon_place.erl
@@ -155,10 +155,8 @@ move2(DG, V, LastX, DeltaX) ->
     ChLX = foldl(fun(C, LX) -> move2(DG, C, LX, DeltaX) end,
 		 tll(LastX), 
 		 appmon_dg:get(out, DG, V)),
-    [max(NewX+appmon_dg:get(w, DG, V), hdd(LastX)) | ChLX].
+    [erlang:max(NewX+appmon_dg:get(w, DG, V), hdd(LastX)) | ChLX].
 
-max(A, B) when A>B -> A;
-max(_, B) -> B.
 
 %%------------------------------------------------------------
 %%
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index dc5a1068db..f3a2b01e04 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -18,6 +18,8 @@
 
 -module(beam_validator).
 
+-compile({no_auto_import,[min/2]}).
+
 -export([file/1, files/1]).
 
 %% Interface for compiler.
diff --git a/lib/compiler/src/cerl_inline.erl b/lib/compiler/src/cerl_inline.erl
index 6d7eca0113..c15103999f 100644
--- a/lib/compiler/src/cerl_inline.erl
+++ b/lib/compiler/src/cerl_inline.erl
@@ -65,7 +65,6 @@
 	       try_evars/1, try_handler/1, tuple_es/1, tuple_arity/1,
 	       type/1, values_es/1, var_name/1]).
 
--import(erlang, [max/2]).
 -import(lists, [foldl/3, foldr/3, mapfoldl/3, reverse/1]).
 
 %%
@@ -201,9 +200,9 @@ start(Reply, Tree, Ctxt, Opts) ->
         false ->
             ok
     end,
-    Size = max(1, proplists:get_value(inline_size, Opts)),
-    Effort = max(1, proplists:get_value(inline_effort, Opts)),
-    Unroll = max(1, proplists:get_value(inline_unroll, Opts)),
+    Size = erlang:max(1, proplists:get_value(inline_size, Opts)),
+    Effort = erlang:max(1, proplists:get_value(inline_effort, Opts)),
+    Unroll = erlang:max(1, proplists:get_value(inline_unroll, Opts)),
     case proplists:get_bool(verbose, Opts) of
 	true ->
 	    io:fwrite("Inlining: inline_size=~w inline_effort=~w\n",
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index 7a2057713e..0a03b42eac 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -73,14 +73,12 @@ depth(T) ->
 	[] ->
 	    0;
 	Gs ->
-	    1 + lists:foldl(fun (G, A) -> max(depth_1(G), A) end, 0, Gs)
+	    1 + lists:foldl(fun (G, A) -> erlang:max(depth_1(G), A) end, 0, Gs)
     end.
 
 depth_1(Ts) ->
-    lists:foldl(fun (T, A) -> max(depth(T), A) end, 0, Ts).
+    lists:foldl(fun (T, A) -> erlang:max(depth(T), A) end, 0, Ts).
 
-max(X, Y) when X > Y -> X; 
-max(_, Y) -> Y.
 
 
 %% @spec size(Tree::cerl()) -> integer()
diff --git a/lib/debugger/src/dbg_ui_trace_win.erl b/lib/debugger/src/dbg_ui_trace_win.erl
index dbf93c7f45..8249f876d8 100644
--- a/lib/debugger/src/dbg_ui_trace_win.erl
+++ b/lib/debugger/src/dbg_ui_trace_win.erl
@@ -106,7 +106,7 @@ create_win(GS, Title, TraceWin, Menus) ->
 		   gs:read('CodeArea', height) +
 		   gs:read('RB1', height) +
 		   gs:read('ButtonArea', height) +
-		   max(gs:read('EvalArea', height),
+		   erlang:max(gs:read('EvalArea', height),
 		       gs:read('BindArea', height)) +
 		   gs:read('RB2', height) +
 		   gs:read('TraceArea', height)}),
@@ -1032,7 +1032,7 @@ config_v() ->
     gs:config('RB3', {y,Y3}),
     gs:config('BindArea', {y,Y3}),
     
-    Y4 = Y3 + max(gs:read('EvalArea', height),
+    Y4 = Y3 + erlang:max(gs:read('EvalArea', height),
 		  gs:read('BindArea', height)),
     gs:config('RB2', {y,Y4}),
     
@@ -1061,7 +1061,7 @@ configure(WinInfo, NewW, NewH) ->
     OldH = 25+gs:read('CodeArea', height)+
 	gs:read('RB1', height)+
 	gs:read('ButtonArea', height)+
-	max(gs:read('EvalArea', height), gs:read('BindArea', height))+
+	erlang:max(gs:read('EvalArea', height), gs:read('BindArea', height))+
 	gs:read('RB2', height)+
 	gs:read('TraceArea', height),
 
@@ -1112,7 +1112,7 @@ configure_widths(OldW, NewW, Flags) ->
     {_Bu,Ev,Bi,_Tr} = Flags,
 
     %% Difference between old and new width, considering min window width
-    Diff = abs(max(OldW,330)-max(NewW,330)),
+    Diff = abs(erlang:max(OldW,330)-erlang:max(NewW,330)),
     
     %% Check how much the frames can be resized in reality
     Limits = if
@@ -1166,7 +1166,7 @@ configure_heights(OldH, NewH, Flags) ->
 
     %% Difference between old and new height, considering min win height
     MinH = min_height(Flags),
-    Diff = abs(max(OldH,MinH)-max(NewH,MinH)),
+    Diff = abs(erlang:max(OldH,MinH)-erlang:max(NewH,MinH)),
     
     %% Check how much the frames can be resized in reality
     {T,Sf,Ff} = if
@@ -1392,7 +1392,7 @@ rblimits('RB1',_W,H) ->
 		  H-112;
 	      _ ->
 		  Y = gs:read('RB2',y),
-		  max(Min,Y-140)
+		  erlang:max(Min,Y-140)
 	  end,
     
     {Min,Max};
@@ -1403,7 +1403,7 @@ rblimits('RB2',_W,H) ->
     
     %% Min is decided by a minimum distance to 'RB1'
     Y = gs:read('RB1',y),
-    Min = min(Max,Y+140),
+    Min = erlang:min(Max,Y+140),
     
     {Min,Max};
 
@@ -1412,13 +1412,7 @@ rblimits('RB3',W,_H) ->
     %% Neither CodeArea nor BindArea should occupy 
     %% less than 1/3 of the total window width and EvalFrame should
     %% be at least 289 pixels wide
-    {max(round(W/3),289),round(2*W/3)}.
-
-max(A, B) when A>B -> A;
-max(_A, B) -> B.
-
-min(A, B) when A<B -> A;
-min(_A, B) -> B.
+    {erlang:max(round(W/3),289),round(2*W/3)}.
 
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_ui_win.erl b/lib/debugger/src/dbg_ui_win.erl
index 9840aa54da..71878f445b 100644
--- a/lib/debugger/src/dbg_ui_win.erl
+++ b/lib/debugger/src/dbg_ui_win.erl
@@ -76,13 +76,10 @@ min_size(Font, Strings, MinW, MinH) ->
 
 min_size(GS, Font, [String|Strings], MinW, MinH) ->
     {W, H} = gs:read(GS, {font_wh, {Font, String}}),
-    min_size(GS, Font, Strings, max(MinW, W), max(MinH, H));
+    min_size(GS, Font, Strings, erlang:max(MinW, W), erlang:max(MinH, H));
 min_size(_GS, _Font, [], W, H) ->
     {W, H}.
 
-max(X, Y) when X>Y -> X;
-max(_X, Y) -> Y.
-
 %%--------------------------------------------------------------------
 %% create_menus(MenuBar, [Menu])
 %%   MenuBar = gsobj()
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 3799acdc1b..2b4a1164ad 100755
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -632,7 +632,7 @@ handle_event(#wx{id=?SASH_CODE, event=#wxSash{dragRect={_X,_Y,_W,H}}}, Wi) ->
 	    Change = CH - H, 
 	    ChangeH = fun(Item) ->
 			      {ItemW, ItemH} = wxSizerItem:getMinSize(Item),
-			      wxSizerItem:setInitSize(Item, ItemW, max(ItemH+Change,-1))
+			      wxSizerItem:setInitSize(Item, ItemW, erlang:max(ItemH+Change,-1))
 		      end,
 	    if Enable ->
 		    {IW, IH} = wxSizer:getMinSize(InfoSzr),
@@ -694,7 +694,7 @@ handle_event(#wx{id=?SASH_TRACE, event=#wxSash{dragRect={_X,_Y,_W,H}}}, Wi) ->
 	true ->  %% Change the Eval and Bindings area
 	    ChangeH = fun(Item) ->
 			      {ItemW, ItemH} = wxSizerItem:getMinSize(Item),
-			      wxSizerItem:setInitSize(Item, ItemW, max(ItemH+Change,-1))
+			      wxSizerItem:setInitSize(Item, ItemW, erlang:max(ItemH+Change,-1))
 		      end,
 	    {IW, IH} = wxSizer:getMinSize(InfoSzr),
 	    [ChangeH(Child) || Child <- wxSizer:getChildren(InfoSzr)],
@@ -1021,9 +1021,3 @@ helpwin(Type, WinInfo = #winInfo{sg=Sg =#sub{in=Sa}}) ->
 	search   ->  wxWindow:setFocus(Sa#sa.search)
     end,
     Wi.
-
-max(X,Y) when X > Y -> X;
-max(_,Y) -> Y.
-     
-
-   
diff --git a/lib/gs/src/tool_utils.erl b/lib/gs/src/tool_utils.erl
index 697dd07151..3b82a4f96c 100644
--- a/lib/gs/src/tool_utils.erl
+++ b/lib/gs/src/tool_utils.erl
@@ -224,11 +224,11 @@ help_win(Type, Parent, Strings) ->
     {Wbtn0,Hbtn0} = gs:read(Lbl, {font_wh,{Font,"Cancel"}}),
     
     %% Compute size of the objects and adjust the graphics accordingly
-    Wbtn = max(Wbtn0+10, ?Wbtn),
-    Hbtn = max(Hbtn0+10, ?Hbtn),
-    Hent = max(Hent0+10, ?Hent),
-    Wlbl = max(Wlbl0, max(Nbtn*Wbtn+(Nbtn-1)*?PAD, ?Wlbl)),
-    Hlbl = max(Hlbl0, ?Hlbl),
+    Wbtn = erlang:max(Wbtn0+10, ?Wbtn),
+    Hbtn = erlang:max(Hbtn0+10, ?Hbtn),
+    Hent = erlang:max(Hent0+10, ?Hent),
+    Wlbl = erlang:max(Wlbl0, erlang:max(Nbtn*Wbtn+(Nbtn-1)*?PAD, ?Wlbl)),
+    Hlbl = erlang:max(Hlbl0, ?Hlbl),
 
     Wwin = ?PAD+Wlbl+?PAD,
 
@@ -297,9 +297,6 @@ data("Yes") ->    {helpwin,yes};
 data("No") ->     {helpwin,no};
 data("Cancel") -> {helpwin,cancel}.
 
-max(X, Y) when X>Y -> X;
-max(_X, Y) -> Y.
-
 get_coords(Parent, W, H) ->
     case gs:read(Parent, x) of
 	X when is_integer(X) ->
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index f3b91b3953..92c36d5bca 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -210,6 +210,7 @@
 	]).
 
 %%-define(DO_ERL_TYPES_TEST, true).
+-compile({no_auto_import,[min/2,max/2]}).
 
 -ifdef(DO_ERL_TYPES_TEST).
 -export([test/0]).
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index e21a0c88f3..3875eca39d 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -191,7 +191,7 @@ options([{format, Format} | L], Opts) when Format =:= binary;
 options([{format, binary_term} | L], Opts) ->
     options(L, Opts#opts{format = binary_term_fun()});
 options([{size, Size} | L], Opts) when is_integer(Size), Size >= 0 ->
-    options(L, Opts#opts{size = max(Size, 1)});
+    options(L, Opts#opts{size = erlang:max(Size, 1)});
 options([{no_files, NoFiles} | L], Opts) when is_integer(NoFiles), 
                                               NoFiles > 1 ->
     options(L, Opts#opts{no_files = NoFiles});
@@ -997,10 +997,10 @@ close_read_fun(Fd, FileName, fsort) ->
     file:delete(FileName).
 
 read_objs(Fd, FileName, I, L, Bin0, Size0, LSz, W) ->
-    Max = max(Size0, ?CHUNKSIZE),
+    Max = erlang:max(Size0, ?CHUNKSIZE),
     BSz0 = byte_size(Bin0),
     Min = Size0 - BSz0 + W#w.hdlen, % Min > 0
-    NoBytes = max(Min, Max),
+    NoBytes = erlang:max(Min, Max),
     case read(Fd, FileName, NoBytes, W) of
         {ok, Bin} ->
             BSz = byte_size(Bin),
@@ -1180,9 +1180,6 @@ make_key2([Kp], T) ->
 make_key2([Kp | Kps], T) ->
     [element(Kp, T) | make_key2(Kps, T)].
 
-max(A, B) when A < B -> B;
-max(A, _) -> A.
-
 infun(W) ->
     W1 = W#w{in = undefined},
     try (W#w.in)(read) of
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index 857eda8161..08ee595f4d 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -18,6 +18,9 @@
 %%
 -module(lists).
 
+-compile({no_auto_import,[max/2]}).
+-compile({no_auto_import,[min/2]}).
+
 -export([append/2, append/1, subtract/2, reverse/1,
 	 nth/2, nthtail/2, prefix/2, suffix/2, last/1, 
 	 seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3,
diff --git a/lib/syntax_tools/src/erl_recomment.erl b/lib/syntax_tools/src/erl_recomment.erl
index 145bbc6f37..94e760dad7 100644
--- a/lib/syntax_tools/src/erl_recomment.erl
+++ b/lib/syntax_tools/src/erl_recomment.erl
@@ -486,7 +486,7 @@ build_tree(Node) ->
 	    
 	    %% Include L, while preserving Min =< Max.
 	    tree_node(minpos(L, Min),
-		      max(L, Max),
+		      erlang:max(L, Max),
 		      erl_syntax:type(Node),
 		      erl_syntax:get_attrs(Node),
 		      Subtrees)
@@ -507,7 +507,7 @@ build_list(Ts) ->
 build_list([T | Ts], Min, Max, Ack) ->
     Node = build_tree(T),
     Min1 = minpos(node_min(Node), Min),
-    Max1 = max(node_max(Node), Max),
+    Max1 = erlang:max(node_max(Node), Max),
     build_list(Ts, Min1, Max1, [Node | Ack]);
 build_list([], Min, Max, Ack) ->
     list_node(Min, Max, lists:reverse(Ack)).
@@ -518,7 +518,7 @@ build_list_list(Ls) ->
 build_list_list([L | Ls], Min, Max, Ack) ->
     Node = build_list(L),
     Min1 = minpos(node_min(Node), Min),
-    Max1 = max(node_max(Node), Max),
+    Max1 = erlang:max(node_max(Node), Max),
     build_list_list(Ls, Min1, Max1, [Node | Ack]);
 build_list_list([], Min, Max, Ack) ->
     {lists:reverse(Ack), Min, Max}.
@@ -723,9 +723,6 @@ tree_node_attrs(#tree{attrs = Attrs}) ->
 
 %% Just the generic "maximum" function
 
-max(X, Y) when X > Y -> X;
-max(_, Y) -> Y.
-
 %% Return the least positive integer of X and Y, or zero if none of them
 %% are positive. (This is necessary for computing minimum source line
 %% numbers, since zero (or negative) numbers may occur, but they
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 5c4e074488..1c0367c3d9 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -400,10 +400,7 @@ new_variable_name(N, R, _T, F, S) ->
 %% implementation of `sets'.
 
 start_range(S) ->
-    max(sets:size(S) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
-
-max(X, Y) when X > Y -> X;
-max(_, Y) -> Y.
+    erlang:max(sets:size(S) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
 
 %% The previous number might or might not be used to compute the
 %% next number to be tried. It is currently not used.
diff --git a/lib/tv/src/tv_io_lib_format.erl b/lib/tv/src/tv_io_lib_format.erl
index 5042fd3f9d..b7d4b8505f 100644
--- a/lib/tv/src/tv_io_lib_format.erl
+++ b/lib/tv/src/tv_io_lib_format.erl
@@ -188,7 +188,7 @@ indentation([], I) -> I.
 
 term(T, none, _Adj, none, _Pad) -> T;
 term(T, none, Adj, P, Pad) -> term(T, P, Adj, P, Pad);
-term(T, F, Adj, none, Pad) -> term(T, F, Adj, min(flat_length(T), F), Pad);
+term(T, F, Adj, none, Pad) -> term(T, F, Adj, erlang:min(flat_length(T), F), Pad);
 term(T, F, Adj, P, Pad) when F >= P ->
     adjust_error(T, F, Adj, P, Pad).
 
@@ -316,7 +316,7 @@ fwrite_g(Fl, F, Adj, P, Pad) ->
 
 string(S, none, _Adj, none, _Pad) -> S;
 string(S, F, Adj, none, Pad) ->
-    string(S, F, Adj, min(flat_length(S), F), Pad);
+    string(S, F, Adj, erlang:min(flat_length(S), F), Pad);
 string(S, none, _Adj, P, Pad) ->
     string:left(flatten(S), P, Pad);
 string(S, F, Adj, P, Pad) when F >= P ->
@@ -362,9 +362,6 @@ reverse([H|T], Stack) ->
     reverse(T, [H|Stack]);
 reverse([], Stack) -> Stack.
 
-min(L, R) when L < R -> L;
-min(_, R) -> R.
-
 %% flatten(List)
 %%  Flatten a list.
 
diff --git a/lib/tv/src/tv_pb.erl b/lib/tv/src/tv_pb.erl
index 34db8d0772..4c30cb8320 100644
--- a/lib/tv/src/tv_pb.erl
+++ b/lib/tv/src/tv_pb.erl
@@ -522,7 +522,7 @@ handle_col_resizing(RbtnId, RealCol, VirtualCol, Xpos, ProcVars) ->
 get_xdiff(Id, Btn, LastXdiff, LineId, LineXpos, MinAllowedXdiff) ->
     receive
 	{gs, Id, motion, {resbtn, _RealCol, _VirtCol, _OldXpos}, [NewXdiff | _T]} ->
-	    UsedXdiff = max(MinAllowedXdiff, NewXdiff),
+	    UsedXdiff = erlang:max(MinAllowedXdiff, NewXdiff),
 	    gs:config(LineId, [{x, LineXpos + UsedXdiff}]),
 	    get_xdiff(Id, Btn, UsedXdiff, LineId, LineXpos, MinAllowedXdiff);
 	{gs, Id, buttonrelease, _Data, [Btn | _T]} ->
@@ -658,28 +658,3 @@ update_vbtns(Msg, ProcVars) ->
 update_keys(Msg, ProcVars) ->
     #pb_key_info{list_of_keys = KeyList} = Msg,
     tv_pb_funcs:update_keys(KeyList, ProcVars).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-max(A, B) when A >= B ->
-    A;
-max(_, B) ->
-    B.
-    
-
diff --git a/lib/tv/src/tv_pg_gridfcns.erl b/lib/tv/src/tv_pg_gridfcns.erl
index 809403fd96..10445ccabe 100644
--- a/lib/tv/src/tv_pg_gridfcns.erl
+++ b/lib/tv/src/tv_pg_gridfcns.erl
@@ -98,7 +98,7 @@ init_grid(GridParentId, GridWidth,
 			     nof_rows_shown      = NofRowsShown
 			    },
 
-    NewNofCols = max(length(ColsShown), NofCols),
+    NewNofCols = erlang:max(length(ColsShown), NofCols),
 
        % The GridColWidths list shall contain the current width of each frame.
     NewColWidths = update_col_widths(ColsShown, ColWidths, FirstColShown, 
@@ -270,7 +270,7 @@ resize_grid_column(RealCol, VirtualCol, Xdiff, ProcVars) ->
 		 lists_as_strings = ListAsStr}  = GridP,
     
        % Get new width!
-    Width = min(MaxColWidth, max((lists:nth(VirtualCol, ColWidths) + Xdiff),
+    Width = erlang:min(MaxColWidth, erlang:max((lists:nth(VirtualCol, ColWidths) + Xdiff),
 				 MinColWidth)),
 
        % Resize the column.
@@ -1336,7 +1336,7 @@ resize_all_grid_columns(RealCol, [ColWidth | Tail], ColFrameIds, MaxColWidth, Mi
 
 
 resize_one_column(RealCol, Width, ColFrameIds, MaxW, MinW) ->
-    NewWidthOfCol = min(MaxW, max(Width, MinW)),
+    NewWidthOfCol = erlang:min(MaxW, erlang:max(Width, MinW)),
     case length(ColFrameIds) of
 	RealCol ->
 	    done;
@@ -1894,46 +1894,3 @@ extract_ids_for_one_row(N, [ColIds | Tail]) ->
 %%%---------------------------------------------------------------------
 %%% END of functions used to create the grid.
 %%%---------------------------------------------------------------------
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-max(A, B) when A > B ->
-    A;
-max(_, B) ->
-    B.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-min(A, B) when A < B ->
-    A;
-min(_, B) ->
-    B.
-