diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index f4efb72767..48aad42910 100755
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -227,7 +227,6 @@ namespace
 		}
 		return "Unknown";
 	}
-#endif // </FS:ND>
 } // end unnamed namespace
 
 // The base class for implementations.
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 66abfd4805..60d05a9b87 100755
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -45,7 +45,7 @@ class LL_COMMON_API LLThread
 {
 private:
 	friend class LLMutex;
-	static uintptr_t sIDIter;
+	static U32 sIDIter;
 
 public:
 	typedef enum e_thread_status
@@ -62,7 +62,7 @@ public:
 	bool isQuitting() const { return (QUITTING == mStatus); }
 	bool isStopped() const { return (STOPPED == mStatus); }
 	
-	static uintptr_t currentID(); // Return ID of current thread
+	static U32 currentID(); // Return ID of current thread
 	static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure.
 	
 public: