tvarious fixes - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 819822c98db971219e5b54ce5f85101c173c1cda
 (DIR) parent e42882dc96325652ff553838e560e6901b5d7977
 (HTM) Author: rsc <devnull@localhost>
       Date:   Wed, 16 Jun 2004 16:45:22 +0000
       
       various fixes
       
       Diffstat:
         M include/libc.h                      |       1 +
         M include/nfs3.h                      |       2 +-
         M include/venti.h                     |      17 ++++++++++-------
       
       3 files changed, 12 insertions(+), 8 deletions(-)
       ---
 (DIR) diff --git a/include/libc.h b/include/libc.h
       t@@ -496,6 +496,7 @@ extern        void        privfree(void**);
        extern        int        p9accept(int, char*);
        extern        int        p9announce(char*, char*);
        extern        int        p9dial(char*, char*, char*, int*);
       +extern        int        p9dialparse(char *ds, char **net, char **unixa, u32int *ip, int *port);
        extern        void        p9setnetmtpt(char*, int, char*);
        extern        int        p9hangup(int);
        extern        int        p9listen(char*, char*);
 (DIR) diff --git a/include/nfs3.h b/include/nfs3.h
       t@@ -186,7 +186,7 @@ typedef enum
                Nfs3ErrAborted = 10010,
        } Nfs3Status;
        
       -void nfs3Errstr(Nfs3Status);
       +void nfs3errstr(Nfs3Status);
        
        typedef enum
        {
 (DIR) diff --git a/include/venti.h b/include/venti.h
       t@@ -1,6 +1,6 @@
        #ifndef _VENTI_H_
        #define _VENTI_H_ 1
       -#if defined(__cplusplus)
       +#ifdef __cplusplus
        extern "C" { 
        #endif
        /* XXX should be own library? */
       t@@ -37,10 +37,10 @@ void packetsha1(Packet*, uchar sha1[20]);
        
        /* XXX begin actual venti.h */
        
       -/*
       -#pragma lib "libnventi.a"
       -#pragma src "/sys/src/libnventi"
       -*/
       +#ifndef PLAN9PORT
       +#pragma lib "libventi.a"
       +#pragma src "/sys/src/libventi"
       +#endif
        
        typedef struct VtFcall VtFcall;
        typedef struct VtConn VtConn;
       t@@ -166,7 +166,10 @@ int vtparsescore(char *s, char **prefix, uchar[VtScoreSize]);
         *
         * V        a venti score
         */
       -/* #pragma        varargck        type        "V"                uchar* */
       +#ifndef PLAN9PORT
       +#pragma        varargck        type        "V"                uchar*
       +#pragma varargck        type        "F"                VtFcall*
       +#endif
        
        int vtscorefmt(Fmt*);
        
       t@@ -449,7 +452,7 @@ int vtfileremove(VtFile*);
        extern int chattyventi;
        extern int ventidoublechecksha1;
        
       -#if defined(__cplusplus)
       +#ifdef __cplusplus
        }
        #endif
        #endif