Bug 492625 - "Stop using underscores to start #defines" [r=vlad]
authorSaint Wesonga <wesongathedeveloper@yahoo.com>
Tue, 01 Jun 2010 08:38:00 -0400
changeset 43071 bed010a947a5cc616dc22621986b02c2ec68129b
parent 43070 ab685c3e46ebb65d19a55bc4479032ab6993f006
child 43072 9be97a5edd729f72029d353594211f223c6dd784
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad
bugs492625
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 492625 - "Stop using underscores to start #defines" [r=vlad]
storage/build/mozStorageCID.h
storage/public/mozStorage.h
storage/public/mozStorageHelper.h
storage/src/SQLCollations.h
storage/src/mozStorageArgValueArray.h
storage/src/mozStorageAsyncStatementExecution.h
storage/src/mozStorageBindingParams.h
storage/src/mozStorageBindingParamsArray.h
storage/src/mozStorageConnection.h
storage/src/mozStorageError.h
storage/src/mozStoragePrivateHelpers.h
storage/src/mozStorageResultSet.h
storage/src/mozStorageRow.h
storage/src/mozStorageSQLFunctions.h
storage/src/mozStorageService.h
storage/src/mozStorageStatement.h
storage/src/mozStorageStatementData.h
storage/src/mozStorageStatementJSHelper.h
storage/src/mozStorageStatementParams.h
storage/src/mozStorageStatementRow.h
storage/src/mozStorageStatementWrapper.h
--- a/storage/build/mozStorageCID.h
+++ b/storage/build/mozStorageCID.h
@@ -31,18 +31,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGECID_H_
-#define _MOZSTORAGECID_H_
+#ifndef MOZSTORAGECID_H
+#define MOZSTORAGECID_H
 
 #define MOZ_STORAGE_CONTRACTID_PREFIX "@mozilla.org/storage"
 
 
 /* b71a1f84-3a70-4d37-a348-f1ba0e27eead */
 #define MOZ_STORAGE_CONNECTION_CID \
 { 0xb71a1f84, 0x3a70, 0x4d37, {0xa3, 0x48, 0xf1, 0xba, 0x0e, 0x27, 0xee, 0xad} }
 
@@ -55,9 +55,9 @@
 #define MOZ_STORAGE_SERVICE_CONTRACTID MOZ_STORAGE_CONTRACTID_PREFIX "/service;1"
 
 /* dab3a846-3a59-4fc2-9745-c6ff48776f00 */
 #define MOZ_STORAGE_STATEMENT_WRAPPER_CID \
 { 0xdab3a846, 0x3a59, 0x4fc2, {0x97, 0x45, 0xc6, 0xff, 0x48, 0x77, 0x6f, 0x00} }
 
 #define MOZ_STORAGE_STATEMENT_WRAPPER_CONTRACTID MOZ_STORAGE_CONTRACTID_PREFIX "/statement-wrapper;1"
 
-#endif /* _MOZSTORAGECID_H_ */
+#endif /* MOZSTORAGECID_H */
--- a/storage/public/mozStorage.h
+++ b/storage/public/mozStorage.h
@@ -31,18 +31,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGE_H_
-#define _MOZSTORAGE_H_
+#ifndef MOZSTORAGE_H
+#define MOZSTORAGE_H
 
 #define NS_ERROR_STORAGE_BUSY \
   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, 1)
 
 #define NS_ERROR_STORAGE_IOERR \
   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, 2)
 
-#endif /* _MOZSTORAGE_H_ */
+#endif /* MOZSTORAGE_H */
--- a/storage/public/mozStorageHelper.h
+++ b/storage/public/mozStorageHelper.h
@@ -31,18 +31,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGEHELPER_H_
-#define _MOZSTORAGEHELPER_H_
+#ifndef MOZSTORAGEHELPER_H
+#define MOZSTORAGEHELPER_H
 
 #include "nsAutoPtr.h"
 
 #include "mozIStorageConnection.h"
 #include "mozIStorageStatement.h"
 #include "mozStorage.h"
 
 
@@ -187,9 +187,9 @@ public:
   {
     mStatement = nsnull;
   }
 
 protected:
   nsCOMPtr<mozIStorageStatement> mStatement;
 };
 
-#endif /* _MOZSTORAGEHELPER_H_ */
+#endif /* MOZSTORAGEHELPER_H */
--- a/storage/src/SQLCollations.h
+++ b/storage/src/SQLCollations.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozilla_storage_SQLCollations_h_
-#define _mozilla_storage_SQLCollations_h_
+#ifndef mozilla_storage_SQLCollations_h
+#define mozilla_storage_SQLCollations_h
 
 #include "mozStorageService.h"
 #include "nscore.h"
 #include "nsString.h"
 
 #include "sqlite3.h"
 
 namespace mozilla {
@@ -274,9 +274,9 @@ NS_HIDDEN_(int) localeCollationCaseAccen
                                                      int aLen1,
                                                      const void *aStr1,
                                                      int aLen2,
                                                      const void *aStr2);
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozilla_storage_SQLCollations_h_
+#endif // mozilla_storage_SQLCollations_h
--- a/storage/src/mozStorageArgValueArray.h
+++ b/storage/src/mozStorageArgValueArray.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageArgValueArray_h_
-#define _mozStorageArgValueArray_h_
+#ifndef mozStorageArgValueArray_h
+#define mozStorageArgValueArray_h
 
 #include "mozIStorageValueArray.h"
 
 #include "sqlite3.h"
 
 namespace mozilla {
 namespace storage {
 
@@ -58,9 +58,9 @@ public:
 private:
   PRUint32 mArgc;
   sqlite3_value **mArgv;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageArgValueArray_h_
+#endif // mozStorageArgValueArray_h
--- a/storage/src/mozStorageAsyncStatementExecution.h
+++ b/storage/src/mozStorageAsyncStatementExecution.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageAsyncStatementExecution_h_
-#define _mozStorageAsyncStatementExecution_h_
+#ifndef mozStorageAsyncStatementExecution_h
+#define mozStorageAsyncStatementExecution_h
 
 #include "nscore.h"
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 
@@ -245,9 +245,9 @@ private:
    * about the error message, the user gets reliable error messages.
    */
   SQLiteMutex &mDBMutex;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageAsyncStatementExecution_h_
+#endif // mozStorageAsyncStatementExecution_h
--- a/storage/src/mozStorageBindingParams.h
+++ b/storage/src/mozStorageBindingParams.h
@@ -33,18 +33,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageBindingParams_h_
-#define _mozStorageBindingParams_h_
+#ifndef mozStorageBindingParams_h
+#define mozStorageBindingParams_h
 
 #include "nsCOMArray.h"
 #include "nsIVariant.h"
 #include "nsTHashtable.h"
 
 #include "mozStorageBindingParamsArray.h"
 #include "mozStorageStatement.h"
 #include "mozStorageAsyncStatement.h"
@@ -147,9 +147,9 @@ private:
   static PLDHashOperator iterateOverNamedParameters(const nsACString &aName,
                                                     nsIVariant *aValue,
                                                     void *voidClosureThunk);
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageBindingParams_h_
+#endif // mozStorageBindingParams_h
--- a/storage/src/mozStorageBindingParamsArray.h
+++ b/storage/src/mozStorageBindingParamsArray.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageBindingParamsArray_h_
-#define _mozStorageBindingParamsArray_h_
+#ifndef mozStorageBindingParamsArray_h
+#define mozStorageBindingParamsArray_h
 
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
 #include "mozIStorageBindingParamsArray.h"
 
 namespace mozilla {
 namespace storage {
@@ -136,9 +136,9 @@ private:
   bool mLocked;
 
   friend class iterator;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageBindingParamsArray_h_
+#endif // mozStorageBindingParamsArray_h
--- a/storage/src/mozStorageConnection.h
+++ b/storage/src/mozStorageConnection.h
@@ -33,18 +33,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGECONNECTION_H_
-#define _MOZSTORAGECONNECTION_H_
+#ifndef MOZSTORAGECONNECTION_H
+#define MOZSTORAGECONNECTION_H
 
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Mutex.h"
 
 #include "nsString.h"
 #include "nsInterfaceHashtable.h"
 #include "mozIStorageProgressHandler.h"
@@ -209,9 +209,9 @@ private:
   // connections do not outlive the service.  2) Our custom collating functions
   // call its localeCompareStrings() method.
   nsRefPtr<Service> mStorageService;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif /* _MOZSTORAGECONNECTION_H_ */
+#endif /* MOZSTORAGECONNECTION_H */
--- a/storage/src/mozStorageError.h
+++ b/storage/src/mozStorageError.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef __mozStorageError_h__
-#define __mozStorageError_h__
+#ifndef mozStorageError_h
+#define mozStorageError_h
 
 #include "mozIStorageError.h"
 #include "nsString.h"
 
 namespace mozilla {
 namespace storage {
 
 class Error : public mozIStorageError
@@ -57,9 +57,9 @@ public:
 private:
   int mResult;
   nsCString mMessage;
 };
 
 } // namespace stoarge
 } // namespace mozilla
 
-#endif // __mozStorageError_h__
+#endif // mozStorageError_h
--- a/storage/src/mozStoragePrivateHelpers.h
+++ b/storage/src/mozStoragePrivateHelpers.h
@@ -33,18 +33,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStoragePrivateHelpers_h_
-#define _mozStoragePrivateHelpers_h_
+#ifndef mozStoragePrivateHelpers_h
+#define mozStoragePrivateHelpers_h
 
 /**
  * This file contains convenience methods for mozStorage.
  */
 
 #include "sqlite3.h"
 #include "nsIVariant.h"
 #include "mozStorage.h"
@@ -111,9 +111,9 @@ nsIVariant *convertJSValToVariant(JSCont
  */
 already_AddRefed<nsIRunnable> newCompletionEvent(
   mozIStorageCompletionCallback *aCallback
 );
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStoragePrivateHelpers_h_
+#endif // mozStoragePrivateHelpers_h
--- a/storage/src/mozStorageResultSet.h
+++ b/storage/src/mozStorageResultSet.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef __mozStorageResultSet_h__
-#define __mozStorageResultSet_h__
+#ifndef mozStorageResultSet_h
+#define mozStorageResultSet_h
 
 #include "mozIStorageResultSet.h"
 #include "nsCOMArray.h"
 class mozIStorageRow;
 
 namespace mozilla {
 namespace storage {
 
@@ -76,9 +76,9 @@ private:
    * Stores the tuples.
    */
   nsCOMArray<mozIStorageRow> mData;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // __mozStorageResultSet_h__
+#endif // mozStorageResultSet_h
--- a/storage/src/mozStorageRow.h
+++ b/storage/src/mozStorageRow.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef __mozStorageRow_h__
-#define __mozStorageRow_h__
+#ifndef mozStorageRow_h
+#define mozStorageRow_h
 
 #include "mozIStorageRow.h"
 #include "nsCOMArray.h"
 #include "nsDataHashtable.h"
 class nsIVariant;
 struct sqlite3_stmt;
 
 namespace mozilla {
@@ -80,9 +80,9 @@ private:
    * Maps a given name to a column index.
    */
   nsDataHashtable<nsCStringHashKey, PRUint32> mNameHashtable;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // __mozStorageRow_h__
+#endif // mozStorageRow_h
--- a/storage/src/mozStorageSQLFunctions.h
+++ b/storage/src/mozStorageSQLFunctions.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageSQLFunctions_h_
-#define _mozStorageSQLFunctions_h_
+#ifndef mozStorageSQLFunctions_h
+#define mozStorageSQLFunctions_h
 
 #include "sqlite3.h"
 #include "nscore.h"
 
 namespace mozilla {
 namespace storage {
 
 /**
@@ -101,9 +101,9 @@ NS_HIDDEN_(void) likeFunction(sqlite3_co
  */
 NS_HIDDEN_(void) levenshteinDistanceFunction(sqlite3_context *aCtx,
                                              int aArgc,
                                              sqlite3_value **aArgv);
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageSQLFunctions_h_
+#endif // mozStorageSQLFunctions_h
--- a/storage/src/mozStorageService.h
+++ b/storage/src/mozStorageService.h
@@ -35,18 +35,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGESERVICE_H_
-#define _MOZSTORAGESERVICE_H_
+#ifndef MOZSTORAGESERVICE_H
+#define MOZSTORAGESERVICE_H
 
 #include "nsCOMPtr.h"
 #include "nsICollation.h"
 #include "nsIFile.h"
 #include "nsIObserver.h"
 #include "mozilla/Mutex.h"
 
 #include "mozIStorageService.h"
@@ -133,9 +133,9 @@ private:
   static Service *gService;
 
   static nsIXPConnect *sXPConnect;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif /* _MOZSTORAGESERVICE_H_ */
+#endif /* MOZSTORAGESERVICE_H */
--- a/storage/src/mozStorageStatement.h
+++ b/storage/src/mozStorageStatement.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageStatement_h_
-#define _mozStorageStatement_h_
+#ifndef mozStorageStatement_h
+#define mozStorageStatement_h
 
 #include "nsAutoPtr.h"
 #include "nsString.h"
 
 #include "nsTArray.h"
 
 #include "mozStorageBindingParamsArray.h"
 #include "mozStorageStatementData.h"
@@ -139,9 +139,9 @@ private:
   nsresult internalFinalize(bool aDestructing);
 
     friend class StatementJSHelper;
 };
 
 } // storage
 } // mozilla
 
-#endif // _mozStorageStatement_h_
+#endif // mozStorageStatement_h
--- a/storage/src/mozStorageStatementData.h
+++ b/storage/src/mozStorageStatementData.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageStatementData_h_
-#define _mozStorageStatementData_h_
+#ifndef mozStorageStatementData_h
+#define mozStorageStatementData_h
 
 #include "sqlite3.h"
 
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
 #include "mozStorageBindingParamsArray.h"
 #include "mozIStorageBaseStatement.h"
@@ -149,9 +149,9 @@ private:
    * destroyed out from under us.
    */
   nsCOMPtr<StorageBaseStatementInternal> mStatementOwner;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageStatementData_h_
+#endif // mozStorageStatementData_h
--- a/storage/src/mozStorageStatementJSHelper.h
+++ b/storage/src/mozStorageStatementJSHelper.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef __MOZSTORAGESTATEMENTJSHELPER_H__
-#define __MOZSTORAGESTATEMENTJSHELPER_H__
+#ifndef MOZSTORAGESTATEMENTJSHELPER_H
+#define MOZSTORAGESTATEMENTJSHELPER_H
 
 #include "nsIXPCScriptable.h"
 
 class Statement;
 
 namespace mozilla {
 namespace storage {
 
@@ -56,9 +56,9 @@ public:
 private:
   nsresult getRow(Statement *, JSContext *, JSObject *, jsval *);
   nsresult getParams(Statement *, JSContext *, JSObject *, jsval *);
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // __MOZSTORAGESTATEMENTJSHELPER_H__
+#endif // MOZSTORAGESTATEMENTJSHELPER_H
--- a/storage/src/mozStorageStatementParams.h
+++ b/storage/src/mozStorageStatementParams.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGESTATEMENTPARAMS_H_
-#define _MOZSTORAGESTATEMENTPARAMS_H_
+#ifndef MOZSTORAGESTATEMENTPARAMS_H
+#define MOZSTORAGESTATEMENTPARAMS_H
 
 #include "mozIStorageStatementWrapper.h"
 #include "nsIXPCScriptable.h"
 
 class mozIStorageStatement;
 
 namespace mozilla {
 namespace storage {
@@ -66,9 +66,9 @@ protected:
   PRUint32 mParamCount;
 
   friend class Statement;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif /* _MOZSTORAGESTATEMENTPARAMS_H_ */
+#endif /* MOZSTORAGESTATEMENTPARAMS_H */
--- a/storage/src/mozStorageStatementRow.h
+++ b/storage/src/mozStorageStatementRow.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _MOZSTORAGESTATEMENTROW_H_
-#define _MOZSTORAGESTATEMENTROW_H_
+#ifndef MOZSTORAGESTATEMENTROW_H
+#define MOZSTORAGESTATEMENTROW_H
 
 #include "mozIStorageStatementWrapper.h"
 #include "nsIXPCScriptable.h"
 
 namespace mozilla {
 namespace storage {
 
 class Statement;
@@ -62,9 +62,9 @@ protected:
   Statement *mStatement;
 
   friend class Statement;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif /* _MOZSTORAGESTATEMENTROW_H_ */
+#endif /* MOZSTORAGESTATEMENTROW_H */
--- a/storage/src/mozStorageStatementWrapper.h
+++ b/storage/src/mozStorageStatementWrapper.h
@@ -32,18 +32,18 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef _mozStorageStatementWrapper_h_
-#define _mozStorageStatementWrapper_h_
+#ifndef mozStorageStatementWrapper_h
+#define mozStorageStatementWrapper_h
 
 #include "nsTArray.h"
 #include "nsIXPCScriptable.h"
 
 #include "mozStorageStatement.h"
 #include "mozIStorageStatementWrapper.h"
 
 namespace mozilla {
@@ -74,9 +74,9 @@ private:
 
     nsCOMPtr<mozIStorageStatementRow> mStatementRow;
     nsCOMPtr<mozIStorageStatementParams> mStatementParams;
 };
 
 } // namespace storage
 } // namespace mozilla
 
-#endif // _mozStorageStatementWrapper_h_
+#endif // mozStorageStatementWrapper_h