summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--FreeBSD/386/include/lib9.h4
-rw-r--r--Irix/mips/include/lib9.h4
-rw-r--r--Linux/386/include/lib9.h4
-rw-r--r--Linux/arm/include/lib9.h4
-rw-r--r--MacOSX/386/include/lib9.h4
-rw-r--r--MacOSX/power/include/lib9.h4
-rw-r--r--NetBSD/386/include/lib9.h4
-rwxr-xr-xNt/386/include/lib9.h4
-rw-r--r--OpenBSD/386/include/lib9.h4
-rw-r--r--Plan9/386/include/lib9.h4
-rw-r--r--Plan9/mips/include/lib9.h4
-rw-r--r--Plan9/power/include/lib9.h4
-rw-r--r--Plan9/sparc/include/lib9.h4
-rw-r--r--Solaris/sparc/include/lib9.h4
-rw-r--r--include/version.h2
-rw-r--r--lib9/lock-Nt-386.c6
-rw-r--r--libmemdraw/draw.c2
18 files changed, 35 insertions, 33 deletions
diff --git a/CHANGES b/CHANGES
index 364812b9..438aecf1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20080609
+ _tas type changed from ulong to int
20080530
issue 91: _declspec changed to __declspec in Nt files
issue 92: argv0 declaration changed to extern from static in emu/Nt/win.c
diff --git a/FreeBSD/386/include/lib9.h b/FreeBSD/386/include/lib9.h
index a969d0d2..07884bb3 100644
--- a/FreeBSD/386/include/lib9.h
+++ b/FreeBSD/386/include/lib9.h
@@ -284,11 +284,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Irix/mips/include/lib9.h b/Irix/mips/include/lib9.h
index 11b06c13..8531eaa0 100644
--- a/Irix/mips/include/lib9.h
+++ b/Irix/mips/include/lib9.h
@@ -265,11 +265,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Linux/386/include/lib9.h b/Linux/386/include/lib9.h
index 53b6a4d4..0dd37be1 100644
--- a/Linux/386/include/lib9.h
+++ b/Linux/386/include/lib9.h
@@ -277,11 +277,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Linux/arm/include/lib9.h b/Linux/arm/include/lib9.h
index 8d84d7b7..da2c5d97 100644
--- a/Linux/arm/include/lib9.h
+++ b/Linux/arm/include/lib9.h
@@ -277,11 +277,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/MacOSX/386/include/lib9.h b/MacOSX/386/include/lib9.h
index f7c89d6d..841da466 100644
--- a/MacOSX/386/include/lib9.h
+++ b/MacOSX/386/include/lib9.h
@@ -297,11 +297,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/MacOSX/power/include/lib9.h b/MacOSX/power/include/lib9.h
index c36bfeae..7258d910 100644
--- a/MacOSX/power/include/lib9.h
+++ b/MacOSX/power/include/lib9.h
@@ -297,11 +297,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/NetBSD/386/include/lib9.h b/NetBSD/386/include/lib9.h
index b72b24d1..43426125 100644
--- a/NetBSD/386/include/lib9.h
+++ b/NetBSD/386/include/lib9.h
@@ -287,11 +287,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Nt/386/include/lib9.h b/Nt/386/include/lib9.h
index 7b723c5f..d45f226c 100755
--- a/Nt/386/include/lib9.h
+++ b/Nt/386/include/lib9.h
@@ -289,11 +289,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/OpenBSD/386/include/lib9.h b/OpenBSD/386/include/lib9.h
index a0fc2caf..f5780dbe 100644
--- a/OpenBSD/386/include/lib9.h
+++ b/OpenBSD/386/include/lib9.h
@@ -284,11 +284,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Plan9/386/include/lib9.h b/Plan9/386/include/lib9.h
index aab2d462..ba62ee32 100644
--- a/Plan9/386/include/lib9.h
+++ b/Plan9/386/include/lib9.h
@@ -380,10 +380,10 @@ extern int toupper(int);
*/
typedef
struct Lock {
- ulong val;
+ int val;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Plan9/mips/include/lib9.h b/Plan9/mips/include/lib9.h
index ae392b9a..fbe61060 100644
--- a/Plan9/mips/include/lib9.h
+++ b/Plan9/mips/include/lib9.h
@@ -380,10 +380,10 @@ extern int toupper(int);
*/
typedef
struct Lock {
- ulong val;
+ int val;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Plan9/power/include/lib9.h b/Plan9/power/include/lib9.h
index 38ac4d15..4a616833 100644
--- a/Plan9/power/include/lib9.h
+++ b/Plan9/power/include/lib9.h
@@ -380,10 +380,10 @@ extern int toupper(int);
*/
typedef
struct Lock {
- ulong val;
+ int val;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Plan9/sparc/include/lib9.h b/Plan9/sparc/include/lib9.h
index 55c99d9d..f04566aa 100644
--- a/Plan9/sparc/include/lib9.h
+++ b/Plan9/sparc/include/lib9.h
@@ -380,10 +380,10 @@ extern int toupper(int);
*/
typedef
struct Lock {
- ulong val;
+ int val;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/Solaris/sparc/include/lib9.h b/Solaris/sparc/include/lib9.h
index cfb8f4a0..1c58889b 100644
--- a/Solaris/sparc/include/lib9.h
+++ b/Solaris/sparc/include/lib9.h
@@ -278,11 +278,11 @@ extern int encodefmt(Fmt*);
*/
typedef
struct Lock {
- ulong val;
+ int val;
int pid;
} Lock;
-extern ulong _tas(ulong*);
+extern int _tas(int*);
extern void lock(Lock*);
extern void unlock(Lock*);
diff --git a/include/version.h b/include/version.h
index d77917dd..80e0c58d 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20080530)"
+#define VERSION "Fourth Edition (20080609)"
diff --git a/lib9/lock-Nt-386.c b/lib9/lock-Nt-386.c
index 641907ef..f6004c35 100644
--- a/lib9/lock-Nt-386.c
+++ b/lib9/lock-Nt-386.c
@@ -1,9 +1,9 @@
#include "lib9.h"
-ulong
-_tas(ulong *la)
+int
+_tas(int *la)
{
- ulong v;
+ int v;
_asm {
mov eax, la
diff --git a/libmemdraw/draw.c b/libmemdraw/draw.c
index 2559f904..8e8b2c5b 100644
--- a/libmemdraw/draw.c
+++ b/libmemdraw/draw.c
@@ -493,7 +493,7 @@ struct Dbuf
uchar *p;
int n;
Param spar, mpar, dpar;
- ulong inuse;
+ int inuse;
};
static Dbuf dbuf[10];