Rename dynld to dynimport throughout.

Cgo users will need to rerun cgo.

R=rsc
CC=golang-dev
http://codereview.appspot.com/692041

4 files changed, 14 insertions, 14 deletions

diff --git a/src/cmd/cc/cc.h b/src/cmd/cc/cc.h
index 6098bc53a..4241c18f7 100644
--- a/src/cmd/cc/cc.h
+++ b/src/cmd/cc/cc.h
@@ -56,7 +56,7 @@ typedef	struct	Hist	Hist;
 typedef	struct	Term	Term;
 typedef	struct	Init	Init;
 typedef	struct	Bits	Bits;
-typedef	struct	Dynld	Dynld;
+typedef	struct	Dynimp	Dynimp;
 
 #define	NHUNK		50000L
 #define	BUFSIZ		8192
@@ -444,15 +444,15 @@ struct	Funct
 	Sym*	castfr[NTYPE];
 };
 
-struct	Dynld
+struct	Dynimp
 {
 	char*	local;
 	char*	remote;
 	char*	path;
 };
 
-EXTERN	Dynld	*dynld;
-EXTERN	int	ndynld;
+EXTERN	Dynimp	*dynimp;
+EXTERN	int	ndynimp;
 
 EXTERN struct
 {
@@ -760,7 +760,7 @@ void	pragpack(void);
 void	pragfpround(void);
 void	pragtextflag(void);
 void	pragincomplete(void);
-void	pragdynld(void);
+void	pragdynimport(void);
 
 /*
  * calls to machine depend part
diff --git a/src/cmd/cc/dpchk.c b/src/cmd/cc/dpchk.c
index 452f39f09..99d8c05f1 100644
--- a/src/cmd/cc/dpchk.c
+++ b/src/cmd/cc/dpchk.c
@@ -533,11 +533,11 @@ out:
 }
 
 void
-pragdynld(void)
+pragdynimport(void)
 {
 	Sym *local, *remote;
 	char *path;
-	Dynld *f;
+	Dynimp *f;
 
 	local = getsym();
 	if(local == nil)
@@ -551,16 +551,16 @@ pragdynld(void)
 	if(path == nil)
 		goto err;
 
-	if(ndynld%32 == 0)
-		dynld = realloc(dynld, (ndynld+32)*sizeof dynld[0]);
-	f = &dynld[ndynld++];
+	if(ndynimp%32 == 0)
+		dynimp = realloc(dynimp, (ndynimp+32)*sizeof dynimp[0]);
+	f = &dynimp[ndynimp++];
 	f->local = local->name;
 	f->remote = remote->name;
 	f->path = path;
 	goto out;
 
 err:
-	yyerror("usage: #pragma dynld local remote \"path\"");
+	yyerror("usage: #pragma dynimport local remote \"path\"");
 
 out:
 	while(getnsc() != '\n')
diff --git a/src/cmd/cc/lexbody b/src/cmd/cc/lexbody
index c026a8d23..743e6e52d 100644
--- a/src/cmd/cc/lexbody
+++ b/src/cmd/cc/lexbody
@@ -47,7 +47,7 @@ pragvararg(void)
 }
 
 void
-pragdynld(void)
+pragdynimport(void)
 {
 	while(getnsc() != '\n')
 		;
diff --git a/src/cmd/cc/macbody b/src/cmd/cc/macbody
index 7d3acaa8e..37ddc81c9 100644
--- a/src/cmd/cc/macbody
+++ b/src/cmd/cc/macbody
@@ -739,8 +739,8 @@ macprag(void)
 		pragincomplete();
 		return;
 	}
-	if(s && strcmp(s->name, "dynld") == 0) {
-		pragdynld();
+	if(s && strcmp(s->name, "dynimport") == 0) {
+		pragdynimport();
 		return;
 	}
 	while(getnsc() != '\n')