diff options
| author | rsc <devnull@localhost> | 2004-06-16 16:45:22 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-06-16 16:45:22 +0000 |
| commit | 819822c98db971219e5b54ce5f85101c173c1cda (patch) | |
| tree | 729086651bfe85e8d2fd60d183444efe4104442a /include | |
| parent | e42882dc96325652ff553838e560e6901b5d7977 (diff) | |
| download | plan9port-819822c98db971219e5b54ce5f85101c173c1cda.tar.gz plan9port-819822c98db971219e5b54ce5f85101c173c1cda.tar.bz2 plan9port-819822c98db971219e5b54ce5f85101c173c1cda.zip | |
various fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc.h | 1 | ||||
| -rw-r--r-- | include/nfs3.h | 2 | ||||
| -rw-r--r-- | include/venti.h | 17 |
3 files changed, 12 insertions, 8 deletions
diff --git a/include/libc.h b/include/libc.h index ecc46c2c..93a9104a 100644 --- a/include/libc.h +++ b/include/libc.h @@ -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*); diff --git a/include/nfs3.h b/include/nfs3.h index 0da51b51..7967380f 100644 --- a/include/nfs3.h +++ b/include/nfs3.h @@ -186,7 +186,7 @@ typedef enum Nfs3ErrAborted = 10010, } Nfs3Status; -void nfs3Errstr(Nfs3Status); +void nfs3errstr(Nfs3Status); typedef enum { diff --git a/include/venti.h b/include/venti.h index e0ae8c60..0ea07c4c 100644 --- a/include/venti.h +++ b/include/venti.h @@ -1,6 +1,6 @@ #ifndef _VENTI_H_ #define _VENTI_H_ 1 -#if defined(__cplusplus) +#ifdef __cplusplus extern "C" { #endif /* XXX should be own library? */ @@ -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; @@ -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*); @@ -449,7 +452,7 @@ int vtfileremove(VtFile*); extern int chattyventi; extern int ventidoublechecksha1; -#if defined(__cplusplus) +#ifdef __cplusplus } #endif #endif |