xserver: Branch 'master'

[Daniel Stone]

 include/registry.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ff5abc72fcc459d7eac663e5f8e4d40b28749841
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Dec 14 17:59:29 2007 -0200

    registry: XREGISTRY_UNKNOWN needs to be defined even if XREGISTRY isn't enabled
    
    In case XREGISTRY isn't enabled, XREGISTRY_UNKNOWN is used but it's
    not being available. It's now always available.

diff --git a/include/registry.h b/include/registry.h
index edd6ef9..29e5fdf 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -12,6 +12,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef DIX_REGISTRY_H
 #define DIX_REGISTRY_H
 
+/*
+ * Result returned from any unsuccessful lookup
+ */
+#define XREGISTRY_UNKNOWN "<unknown>"
+
 #ifdef XREGISTRY
 
 #include "resource.h"
@@ -36,11 +41,6 @@ const char *LookupErrorName(int error);
 const char *LookupResourceName(RESTYPE rtype);
 
 /*
- * Result returned from any unsuccessful lookup
- */
-#define XREGISTRY_UNKNOWN "<unknown>"
-
-/*
  * Setup and teardown
  */
 void dixResetRegistry(void);