[Webkit-unassigned] [Bug 25616] Add more ENABLE_DATABASE guards.

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=25616


darin at apple.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #30100|review?                     |review-
               Flag|                            |




------- Comment #2 from darin at apple.com  2009-05-07 09:47 PDT -------
(From update of attachment 30100)
Seems like a fine thing to do.

> Index: WebCore/storage/Database.cpp
> ===================================================================
> --- WebCore/storage/Database.cpp	(revision 43341)
> +++ WebCore/storage/Database.cpp	(working copy)
> @@ -49,9 +49,10 @@
>  #include "SQLiteStatement.h"
>  #include "SQLResultSet.h"
>  #include <wtf/MainThread.h>
> -#include <wtf/StdLibExtras.h>
>  #endif
>  
> +#include <wtf/StdLibExtras.h>
> +
>  #if USE(JSC)
>  #include "JSDOMWindow.h"
>  #include <runtime/InitializeThreading.h>

Unconditional includes should go *before* any conditional includes in the first
paragraph. Not between two paragraphs of conditional includes.

> Index: WebCore/storage/DatabaseDetails.h
> ===================================================================
> --- WebCore/storage/DatabaseDetails.h	(revision 43341)
> +++ WebCore/storage/DatabaseDetails.h	(working copy)
> @@ -29,6 +29,8 @@
>  #ifndef DatabaseDetails_h
>  #define DatabaseDetails_h
>  
> +#if ENABLE(DATABASE)
> +
>  #include "PlatformString.h"
>  
>  namespace WebCore {

It's not correct to use the ENABLE macro without first including the Platform.h
header. Doing so changes this header so it can't be included first, which we
don't want. I see the same problem in a few other headers in this patch.

review- since we should get such minor details right in a patch that's entirely
about adding conditionals


-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.