--- Merging r31115 into '.':

U    packages/ncurses/examples/tclock.pp
U    packages/ncurses/examples/tnlshello.pp
U    packages/ncurses/examples/t2form.pp
U    packages/ncurses/examples/t3form.pp
--- Recording mergeinfo for merge of r31115 into '.':
 U   .

# revisions: 31115

git-svn-id: branches/fixes_3_0@31116 -

packages/ncurses/examples/t2form.pp

@@ -3,11 +3,10 @@ program form_test_2;
 {$MODE OBJFPC}
 
 uses
-  ncurses, form;
+  ncurses, form, initc;
 
 
-{$linklib c}
-procedure setlocale(cat : integer; p : pchar); cdecl; external 'c';
+procedure setlocale(cat : integer; p : pchar); cdecl; external clib;
 
 
 const

packages/ncurses/examples/t3form.pp

@@ -6,10 +6,9 @@ program form_test_3;
 {$MODE OBJFPC}
 
 uses
-  ncurses, form;
+  ncurses, form, initc;
 
-{$linklib c}
-procedure setlocale(cat : integer; p : pchar); cdecl; external 'c';
+procedure setlocale(cat : integer; p : pchar); cdecl; external clib;
 
 
 const

packages/ncurses/examples/tclock.pp

@@ -2,10 +2,9 @@ program tclock;
 {$MODE OBJFPC}
 
 uses
-  ncurses, sysutils;
+  ncurses, sysutils, initc;
 
-{$linklib c}
-procedure setlocale(cat : integer; p : pchar); cdecl; external 'c';
+procedure setlocale(cat : integer; p : pchar); cdecl; external clib;
 
 
 const

packages/ncurses/examples/tnlshello.pp

@@ -8,10 +8,9 @@ program nlshello;
 {$mode objfpc}
 
 uses
-  gettext, ncurses;
+  gettext, ncurses, initc;
 
-{$linklib c}
-procedure setlocale(cat : integer; p : pchar); cdecl; external 'c';
+procedure setlocale(cat : integer; p : pchar); cdecl; external clib;
 
 
 const