Skip to content

Commit c9a9cd9

Browse files
joakim-noahjoakim-noah
committed
Replace most usage of std.c.* with the druntime equivalents, in preparation for deprecation of the std.c.* modules.
1 parent 43175e1 commit c9a9cd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+98
-98
lines changed

‎samples/chello.d

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
// From an example from "Inside OLE" Copyright Microsoft
1717

18-
import std.c.stdio;
19-
import std.c.stdlib;
18+
import core.stdc.stdio;
19+
import core.stdc.stdlib;
2020
import std.string;
21-
import std.c.windows.windows;
21+
import core.sys.windows.windows;
2222
import std.c.windows.com;
2323

2424
GUID CLSID_Hello = { 0x30421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };

‎samples/d2html.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "as is" without express or implied warranty.
1212
*/
1313

14-
import std.c.stdio;
14+
import core.stdc.stdio;
1515

1616
import std.conv;
1717
import std.string;

‎samples/dclient.d

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* Compuserve: >INTERNET:kraigb@microsoft.com
1414
*/
1515

16-
import std.c.stdio;
17-
import std.c.stdlib;
18-
import std.c.windows.windows;
16+
import core.stdc.stdio;
17+
import core.stdc.stdlib;
18+
import core.sys.windows.windows;
1919
import std.c.windows.com;
2020

2121
GUID CLSID_Hello = { 0x30421140, 0, 0, [0xC0, 0, 0, 0, 0, 0, 0, 0x46] };

‎samples/dhry.d

+6-6
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@
333333
*************************************************************************
334334
*/
335335

336-
import std.c.stdio;
337-
import std.c.string;
338-
import std.c.stdlib;
336+
import core.stdc.stdio;
337+
import core.stdc.string;
338+
import core.stdc.stdlib;
339339
import std.string;
340340

341341
/* Compiler and system dependent definitions: */
@@ -894,7 +894,7 @@ Boolean Func_3(Enumeration Enum_Par_Val)
894894

895895
version (Win32)
896896
{
897-
import std.c.windows.windows;
897+
import core.sys.windows.windows;
898898

899899
double dtime()
900900
{
@@ -908,7 +908,7 @@ version (Win32)
908908

909909
version (linux)
910910
{
911-
import std.c.linux.linux;
911+
import core.stdc.time;
912912

913913
double dtime()
914914
{
@@ -922,7 +922,7 @@ version (linux)
922922

923923
version (OSX) // supplied by Anders F Bjorklund
924924
{
925-
import std.c.linux.linux;
925+
import core.sys.posix.sys.time;
926926

927927
double dtime()
928928
{

‎samples/dserver.d

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* Compuserve: >INTERNET:kraigb@microsoft.com
1515
*/
1616

17-
import std.c.stdio;
18-
import std.c.stdlib;
19-
import std.c.string;
17+
import core.stdc.stdio;
18+
import core.stdc.stdlib;
19+
import core.stdc.string;
2020
import std.string;
21-
import std.c.windows.windows;
21+
import core.sys.windows.windows;
2222
import std.c.windows.com;
2323

2424
import chello;

‎samples/mydll/dll.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// Public Domain
33

4-
import std.c.windows.windows;
4+
import core.sys.windows.windows;
55
import core.sys.windows.dll;
66

77
__gshared HINSTANCE g_hInst;

‎samples/mydll/mydll.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

22
module mydll;
3-
import std.c.stdio;
3+
import core.stdc.stdio;
44

55
export void dllprint() { printf("hello dll world\n"); }

‎samples/pi.d

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import std.stdio;
22
import std.conv;
3-
import std.c.stdlib;
4-
import std.c.time;
3+
import core.stdc.stdlib;
4+
import core.stdc.time;
55

66
const int LONG_TIME = 4000;
77

@@ -42,11 +42,11 @@ int main(string[] args)
4242
t.length = q + 1;
4343

4444
/* compute pi */
45-
std.c.time.time(&startime);
45+
core.stdc.time.time(&startime);
4646
arctan(2);
4747
arctan(3);
4848
mul4();
49-
std.c.time.time(&endtime);
49+
core.stdc.time.time(&endtime);
5050

5151
// Return to the number of digits we want to display
5252
q--;

‎samples/winsamp.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module winsamp;
1111

1212
pragma(lib, "gdi32.lib");
1313
import core.runtime;
14-
import std.c.windows.windows;
14+
import core.sys.windows.windows;
1515
import std.string;
1616

1717
enum IDC_BTNCLICK = 101;

‎src/backend/gflow.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ STATIC void defstarkill()
774774

775775
#if 1
776776
/* The following program fails for this:
777-
import std.c.stdio;
777+
import core.stdc.stdio;
778778
779779
class Foo
780780
{

‎test/compilable/cppmangle.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
version(linux):
66

7-
import std.c.stdio;
7+
import core.stdc.stdio;
88

99
extern (C++) int foob(int i, int j, int k);
1010

‎test/compilable/imports/art4769a.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module imports.art4769a;
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44

55
template DataStreamability(T)
66
{

‎test/compilable/imports/test25a.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module imports.test25a;
22

33
import imports.test25b;
4-
import std.c.stdio;
4+
import core.stdc.stdio;
55

66
class Afoo
77
{

‎test/compilable/imports/test25b.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module imports.test25b;
22

33
import imports.test25a;
44

5-
import std.c.stdio;
5+
import core.stdc.stdio;
66

77
class Bfoo
88
{

‎test/compilable/testcov1.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// PERMUTE_ARGS:
33
// REQUIRED_ARGS: -cov
44

5-
import std.c.string;
5+
import core.stdc.string;
66
import testcov1a;
77

‎test/d_do_test.d

+2-2
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ string genTempFilename(string result_path)
262262

263263
int system(string command)
264264
{
265-
if (!command) return std.c.process.system(null);
265+
if (!command) return core.stdc.stdlib.system(null);
266266
const commandz = toStringz(command);
267-
auto status = std.c.process.system(commandz);
267+
auto status = core.stdc.stdlib.system(commandz);
268268
if (status == -1) return status;
269269
version (Windows) status <<= 8;
270270
return status;

‎test/fail_compilation/fail262.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fail_compilation/fail262.d(23): Error: function fail262.B.f does not override an
77

88
// Issue 1645 - can override base class' const method with non-const method
99

10-
import std.c.stdio;
10+
import core.stdc.stdio;
1111

1212
class A
1313
{

‎test/fail_compilation/fail329.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fail_compilation/fail329.d(29): Error: variable fail329.A.foo.__ensure.result ca
66
---
77
*/
88

9-
//import std.c.stdio;
9+
//import core.stdc.stdio;
1010

1111
/*******************************************/
1212

‎test/runnable/Same.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// PERMUTE_ARGS:
33

44
module Same; // makes no difference if removed
5-
import std.c.stdio;
5+
import core.stdc.stdio;
66
class Same
77
{
88
this()

‎test/runnable/auto1.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33

44
/******************************************/
55

‎test/runnable/bitops.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// PERMUTE_ARGS:
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44
import core.bitop;
55

66
/*****************************************************/

‎test/runnable/circular.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// Bugzilla 4543
77

8-
import std.c.stdio;
8+
import core.stdc.stdio;
99
import imports.circularA;
1010

1111
class bclass {};

‎test/runnable/closure.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33

44
struct S { int a,b,c,d; }
55

‎test/runnable/delegate.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRED_ARGS:
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44

55
/********************************************************/
66

‎test/runnable/dhry.d

+6-6
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,9 @@
335335
*************************************************************************
336336
*/
337337

338-
import std.c.stdio;
339-
import std.c.string;
340-
import std.c.stdlib;
338+
import core.stdc.stdio;
339+
import core.stdc.string;
340+
import core.stdc.stdlib;
341341
import std.string;
342342

343343

@@ -867,7 +867,7 @@ Boolean Func_3 (Enumeration Enum_Par_Val)
867867

868868
version (Windows)
869869
{
870-
import std.c.windows.windows;
870+
import core.sys.windows.windows;
871871

872872
double dtime()
873873
{
@@ -881,7 +881,7 @@ version (Windows)
881881

882882
version (linux)
883883
{
884-
import std.c.linux.linux;
884+
import core.stdc.time;
885885

886886
double dtime()
887887
{
@@ -895,7 +895,7 @@ version (linux)
895895

896896
version (OSX) // supplied by Anders F Bjorklund
897897
{
898-
import std.c.linux.linux;
898+
import core.sys.posix.sys.time;
899899

900900
double dtime()
901901
{

‎test/runnable/extra-files/mul9377a.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import std.c.stdio;
1+
import core.stdc.stdio;
22

33
import mul9377b;
44

‎test/runnable/extra-files/mul9377b.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module mul9377b;
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44

55
int j;
66

‎test/runnable/extra-files/multi9377.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import std.c.stdio;
1+
import core.stdc.stdio;
22

33
import mul9377a, mul9377b;
44

‎test/runnable/extra-files/test2.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import object;
3-
import std.c.stdio;
3+
import core.stdc.stdio;
44
import std.algorithm;
55

66
/* ================================ */

‎test/runnable/foreach.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33

44
/**************************************************/
55

‎test/runnable/foreach2.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33

44
/**************************************************/
55

‎test/runnable/foreach3.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33

44
struct Foo
55
{

‎test/runnable/foreach4.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
import std.c.stdio;
2+
import core.stdc.stdio;
33
import std.stdio;
44

55
alias bool bit;

‎test/runnable/iasm64.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// written by Walter Bright
66
// http://www.digitalmars.com
77

8-
import std.c.stdio;
8+
import core.stdc.stdio;
99

1010
version (D_PIC)
1111
{

‎test/runnable/imports/Other.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module imports.Other; // makes no difference if removed
22
import Same;
3-
import std.c.stdio;
3+
import core.stdc.stdio;
44

55
class Other : Same // segfault
66
// class Other : Same.Same //***UGLY ALERT*** but doesn't segfault

‎test/runnable/imports/testminitAA.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module imports.testminitAA;
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44
int aa;
55

66
static this()

‎test/runnable/imports/testminitBB.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module imports.testminitBB;
22

3-
import std.c.stdio;
3+
import core.stdc.stdio;
44
int bb;
55

66
static this()

0 commit comments

Comments
 (0)