[hackers] [libixp] Remove BSD specific make syntax. Sorry about that. This is prettier anyway.

changeset: 24:edf65d184be1
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Tue Feb 13 12:15:04 2007 -0500
summary: Remove BSD specific make syntax. Sorry about that. This is prettier anyway.

diff -r cf4511f57458 -r edf65d184be1 Makefile
--- a/Makefile Tue Feb 13 00:35:24 2007 -0500
+++ b/Makefile Tue Feb 13 12:15:04 2007 -0500
@@ -26,12 +26,8 @@ options:
 
 ${OBJ}: config.mk ixp.h ixp_fcall.h
 
-ixp_fcall.h: fcall.h.union fcall.h.nounion config.mk
-.ifndef NO_ANON_STRUCTS
- @cat fcall.h.union > ixp_fcall.h
-.else
- @cat fcall.h.nounion > ixp_fcall.h
-.endif
+ixp_fcall.h: fcall.h fcall.h.nounion config.mk
+ @cat fcall.h${FCALL_H_VERSION} > ixp_fcall.h
 
 libixp.a: ${OBJ}
         @echo AR $@
diff -r cf4511f57458 -r edf65d184be1 config.mk
--- a/config.mk Tue Feb 13 00:35:24 2007 -0500
+++ b/config.mk Tue Feb 13 12:15:04 2007 -0500
@@ -24,7 +24,7 @@ SOFLAGS = -fPIC -shared
 #SOFLAGS = -G
 #LIBS += -lsocket -lnsl
 #CFLAGS += -xtarget=ultra
-#NO_ANON_STRUCTS = TRUE
+#FCALL_H_VERSION= .nounion
 
 # compiler and linker
 AR = ar cr
diff -r cf4511f57458 -r edf65d184be1 fcall.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fcall.h Tue Feb 13 12:15:04 2007 -0500
@@ -0,0 +1,54 @@
+/* from fcall(3) in plan9port */
+typedef struct Fcall {
+ unsigned char type;
+ unsigned short tag;
+ unsigned int fid;
+ union {
+ struct { /* Tversion, Rversion */
+ unsigned int msize;
+ char *version;
+ };
+ struct { /* Tflush */
+ unsigned short oldtag;
+ };
+ struct { /* Rerror */
+ char *ename;
+ };
+ struct { /* Ropen, Rcreate */
+ Qid qid; /* +Rattach */
+ unsigned int iounit;
+ };
+ struct { /* Rauth */
+ Qid aqid;
+ };
+ struct { /* Tauth, Tattach */
+ unsigned int afid;
+ char *uname;
+ char *aname;
+ };
+ struct { /* Tcreate */
+ unsigned int perm;
+ char *name;
+ unsigned char mode; /* +Topen */
+ };
+ struct { /* Twalk */
+ unsigned int newfid;
+ unsigned short nwname;
+ char *wname[IXP_MAX_WELEM];
+ };
+ struct { /* Rwalk */
+ unsigned short nwqid;
+ Qid wqid[IXP_MAX_WELEM];
+ };
+ struct { /* Twrite */
+ unsigned long long offset; /* +Tread */
+ /* +Rread */
+ unsigned int count; /* +Tread */
+ char *data;
+ };
+ struct { /* Twstat, Rstat */
+ unsigned short nstat;
+ unsigned char *stat;
+ };
+ };
+} Fcall;
diff -r cf4511f57458 -r edf65d184be1 fcall.h.union
--- a/fcall.h.union Tue Feb 13 00:35:24 2007 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/* from fcall(3) in plan9port */
-typedef struct Fcall {
- unsigned char type;
- unsigned short tag;
- unsigned int fid;
- union {
- struct { /* Tversion, Rversion */
- unsigned int msize;
- char *version;
- };
- struct { /* Tflush */
- unsigned short oldtag;
- };
- struct { /* Rerror */
- char *ename;
- };
- struct { /* Ropen, Rcreate */
- Qid qid; /* +Rattach */
- unsigned int iounit;
- };
- struct { /* Rauth */
- Qid aqid;
- };
- struct { /* Tauth, Tattach */
- unsigned int afid;
- char *uname;
- char *aname;
- };
- struct { /* Tcreate */
- unsigned int perm;
- char *name;
- unsigned char mode; /* +Topen */
- };
- struct { /* Twalk */
- unsigned int newfid;
- unsigned short nwname;
- char *wname[IXP_MAX_WELEM];
- };
- struct { /* Rwalk */
- unsigned short nwqid;
- Qid wqid[IXP_MAX_WELEM];
- };
- struct { /* Twrite */
- unsigned long long offset; /* +Tread */
- /* +Rread */
- unsigned int count; /* +Tread */
- char *data;
- };
- struct { /* Twstat, Rstat */
- unsigned short nstat;
- unsigned char *stat;
- };
- };
-} Fcall;
Received on Tue Feb 13 2007 - 18:16:48 UTC