inline lib9.h

R=rsc
DELTA=41  (20 added, 2 deleted, 19 changed)
OCL=33412
CL=33415

diff --git a/src/cmd/5a/a.h b/src/cmd/5a/a.h
index a8456b248531b2ae555412d95602ccb1eb90a256..6a40f9c632497209ae0ba26644c47743a9c2260f 100644 (file)
--- a/src/cmd/5a/a.h
+++ b/src/cmd/5a/a.h
@@ -28,7 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 #include <bio.h>
 #include "../5l/5.out.h"
 

diff --git a/src/cmd/5l/l.h b/src/cmd/5l/l.h
index df47d9055ad11dc038a35669a6632f7f0699f5a6..25cffd0c2c05f559bc88ad4036fe0692457e6e25 100644 (file)
--- a/src/cmd/5l/l.h
+++ b/src/cmd/5l/l.h
@@ -28,7 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include       <lib9.h>
+#include       <u.h>
+#include       <libc.h>
 #include       <bio.h>
 #include       "../5l/5.out.h"
 
@@ -74,6 +75,7 @@ struct        Adr
        char    name;
        int32   offset2; // argsize
        char    class;
+       Sym*    gotype;
 };
 
 #define        offset  u0.u0offset
@@ -128,6 +130,7 @@ struct      Sym
        Sym*    link;
        Prog*   text;
        Prog*   data;
+       Sym*    gotype;
 };
 
 #define SIGNINTERN     (1729*325*1729)
@@ -138,6 +141,7 @@ struct      Autom
        Auto*   link;
        int32   aoffset;
        short   type;
+       Sym*    gotype;
 };
 struct Optab
 {
@@ -318,7 +322,6 @@ EXTERN      char*   library[50];
 EXTERN char*   libraryobj[50];
 EXTERN int     libraryp;
 EXTERN int     xrefresolv;
-EXTERN char*   hunk;
 EXTERN uchar   inuxi1[1];
 EXTERN uchar   inuxi2[2];
 EXTERN uchar   inuxi4[4];
@@ -326,7 +329,6 @@ EXTERN      Prog*   lastp;
 EXTERN int32   lcsize;
 EXTERN char    literal[32];
 EXTERN int     nerrors;
-EXTERN int32   nhunk;
 EXTERN int32   instoffset;
 EXTERN Opcross opcross[8];
 EXTERN Oprang  oprange[ALAST];
@@ -419,7 +421,6 @@ void        exchange(Prog*);
 void   export(void);
 int    find1(int32, int);
 void   follow(void);
-void   gethunk(void);
 void   histtoauto(void);
 void   hputl(int);
 double ieeedtod(Ieee*);

diff --git a/src/cmd/8l/l.h b/src/cmd/8l/l.h
index 607fb4d449c62058db574de88a0b51dd3752795a..3452598c52ea12354122c9e1c7dcd8714eff9e42 100644 (file)
--- a/src/cmd/8l/l.h
+++ b/src/cmd/8l/l.h
@@ -28,7 +28,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#include       <lib9.h>
+#include       <u.h>
+#include       <libc.h>
 #include       <bio.h>
 #include       "../8l/8.out.h"
 

diff --git a/src/lib9/argv0.c b/src/lib9/argv0.c
index f109efde0162c922b5291fdec6923c5b56b0234a..623985122b12f92b82fc461b4c4749b3e1e3d2d0 100644 (file)
--- a/src/lib9/argv0.c
+++ b/src/lib9/argv0.c
@@ -23,7 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 
 char *argv0;
 

diff --git a/src/lib9/getfields.c b/src/lib9/getfields.c
index 898328cb845c834f6e99466d18f0c3caa3fb1678..0af8388da8dc6e3098bbecaf35e9b43a06b322f4 100644 (file)
--- a/src/lib9/getfields.c
+++ b/src/lib9/getfields.c
@@ -24,7 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 
 int
 getfields(char *str, char **args, int max, int mflag, char *set)

diff --git a/src/lib9/readn.c b/src/lib9/readn.c
index 76e497de81a16d497e813e53a0c0d367cdad534a..f39b4a4c22d23dbc590ae23fae440eed2d6405ed 100644 (file)
--- a/src/lib9/readn.c
+++ b/src/lib9/readn.c
@@ -24,7 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 
 long
 readn(int f, void *av, long n)

diff --git a/src/lib9/strecpy.c b/src/lib9/strecpy.c
index f38b524c2e57e611e9cac6379af44e38f8948298..389fdc8a025b482f2820d789bd8c0306cc16c2a7 100644 (file)
--- a/src/lib9/strecpy.c
+++ b/src/lib9/strecpy.c
@@ -24,7 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 
 char*
 strecpy(char *to, char *e, char *from)

diff --git a/src/lib9/tokenize.c b/src/lib9/tokenize.c
index 6b8c0e778d580c7fc8c1079f18fd6abc176ce506..52167ff2fdede60ef9022b6efb8e081dc3c9a5b0 100644 (file)
--- a/src/lib9/tokenize.c
+++ b/src/lib9/tokenize.c
@@ -24,7 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <lib9.h>
+#include <u.h>
+#include <libc.h>
 
 static char qsep[] = " \t\r\n";