3 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/Support/ErrorHandling.h b/include/llvm/Support/ErrorHandling.h
index dccdf9b29c..159a3c5d16 100644
--- a/include/llvm/Support/ErrorHandling.h
+++ b/include/llvm/Support/ErrorHandling.h
@@ -45,7 +45,7 @@ namespace llvm {
   /// Restores default error handling behaviour.
   /// This must not be called between llvm_start_multithreaded() and
   /// llvm_stop_multithreaded().
-  void llvm_remove_error_handler(void);
+  void llvm_remove_error_handler();
 
   /// Reports a serious error, calling any installed error handler.
   /// If no error handler is installed the default is to print the message to
diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 5f6578fcb5..f7fbe21ee3 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -250,8 +250,8 @@ protected:
   void error_detected() { Error = true; }
 
   typedef char * iterator;
-  iterator begin(void) { return OutBufStart; }
-  iterator end(void) { return OutBufCur; }
+  iterator begin() { return OutBufStart; }
+  iterator end() { return OutBufCur; }
 
   //===--------------------------------------------------------------------===//
   // Private Interface
diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h
index 32736b4141..71f7655e2e 100644
--- a/include/llvm/Support/type_traits.h
+++ b/include/llvm/Support/type_traits.h
@@ -35,7 +35,7 @@ namespace dont_use
     // important to make the is_class<T>::value idiom zero cost. it
     // evaluates to a constant 1 or 0 depending on whether the
     // parameter T is a class or not (respectively).
-    template<typename T> char is_class_helper(void(T::*)(void));
+    template<typename T> char is_class_helper(void(T::*)());
     template<typename T> double is_class_helper(...);
 }