Remove more unused defines

3 files changed, 2 insertions, 11 deletions

diff --git a/fastos/src/vespa/fastos/thread.h b/fastos/src/vespa/fastos/thread.h
index 1bbda9d7372..a6ef359342a 100644
--- a/fastos/src/vespa/fastos/thread.h
+++ b/fastos/src/vespa/fastos/thread.h
@@ -15,6 +15,7 @@
 #include <vespa/fastos/mutex.h>
 #include <vespa/fastos/cond.h>
 
+typedef pthread_t FastOS_ThreadId;
 
 class FastOS_Runnable;
 class FastOS_ThreadInterface;
diff --git a/fastos/src/vespa/fastos/types.h b/fastos/src/vespa/fastos/types.h
index ea7bf7a5a88..fddf79437d4 100644
--- a/fastos/src/vespa/fastos/types.h
+++ b/fastos/src/vespa/fastos/types.h
@@ -58,10 +58,6 @@
 
 #include <sys/socket.h>
 
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -113,7 +109,7 @@
 #include <getopt.h>
 
 /* 64bit printf specifiers */
-#ifdef FASTOS_64BIT_LONG
+#if (__WORDSIZE == 64)
 
   #ifndef PRIu64
     #define PRIu64        "lu"
@@ -125,5 +121,3 @@
 #else /* ! FASTOS_64BIT_LONG */
   #error "Only 64 environments are supported."
 #endif /* FASTOS_64BIT_LONG */
-
-typedef pthread_t FastOS_ThreadId;
diff --git a/fastos/src/vespa/fastos/unix_socket.cpp b/fastos/src/vespa/fastos/unix_socket.cpp
index 8e0b4b5e658..a6cce42bfad 100644
--- a/fastos/src/vespa/fastos/unix_socket.cpp
+++ b/fastos/src/vespa/fastos/unix_socket.cpp
@@ -20,10 +20,6 @@ bool FastOS_UNIX_Socket::Close()
     return rc;
 }
 
-#ifndef SHUT_WR
-#define SHUT_WR 1
-#endif
-
 bool FastOS_UNIX_Socket::Shutdown()
 {
     bool rc=true;