From f70af6a81eb5c6f3e057029a55f9e0ea527dd7ce Mon Sep 17 00:00:00 2001
From: Terry Dontje <terry.dontje@oracle.com>
Date: Sun, 1 Nov 2009 11:06:20 +0000
Subject: [PATCH] move inclusion of ompi_datatype.h from ompi_common_dll.c to
 ompi_debugger_canary.c to get rid of unresolved symbols

This commit was SVN r22179.
---
 ompi/debuggers/ompi_common_dll.c      | 7 +++----
 ompi/debuggers/ompi_debugger_canary.c | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ompi/debuggers/ompi_common_dll.c b/ompi/debuggers/ompi_common_dll.c
index 4fce47eb70..10afcd547f 100644
--- a/ompi/debuggers/ompi_common_dll.c
+++ b/ompi/debuggers/ompi_common_dll.c
@@ -19,7 +19,7 @@
  * Permission is hereby granted to use, reproduce, prepare derivative
  * works, and to redistribute to others.
  *
- *				  DISCLAIMER
+ *                                DISCLAIMER
  *
  * Neither Dolphin Interconnect Solutions, Etnus LLC, nor any of their
  * employees, makes any warranty express or implied, or assumes any
@@ -36,7 +36,6 @@
 #include "ompi_config.h"
 
 #include "ompi_common_dll_defs.h"
-#include "ompi/datatype/ompi_datatype.h"
 
 /* Basic callbacks into the debugger */
 const mqs_basic_callbacks *mqs_basic_entrypoints;
@@ -402,7 +401,7 @@ int ompi_fill_in_type_info(mqs_image *image, char **message)
             size_t super_offset;
 
             ompi_field_offset(super_offset,
-                          qh_type, ompi_datatype_t, super);
+                              qh_type, ompi_datatype_t, super);
 
             qh_type = mqs_find_type( image, "opal_datatype_t", mqs_lang_c );
             if( !qh_type ) {
@@ -410,7 +409,7 @@ int ompi_fill_in_type_info(mqs_image *image, char **message)
                 goto type_missing;
             }
             ompi_field_offset(i_info->ompi_datatype_t.offset.size,
-	                      qh_type, opal_datatype_t, size);
+                              qh_type, opal_datatype_t, size);
             i_info->ompi_datatype_t.offset.size += super_offset;
         }
     }
diff --git a/ompi/debuggers/ompi_debugger_canary.c b/ompi/debuggers/ompi_debugger_canary.c
index fd666399cc..5c2c4dd585 100644
--- a/ompi/debuggers/ompi_debugger_canary.c
+++ b/ompi/debuggers/ompi_debugger_canary.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2008 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2008 Sun Microystems, Inc.  All rights reserved
+ * Copyright (c) 2008-2009 Sun Microystems, Inc.  All rights reserved
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -18,6 +18,8 @@
 #include "ompi/mca/pml/base/pml_base_request.h"
 #include "ompi/mca/pml/base/pml_base_sendreq.h"
 #include "ompi/mca/pml/base/pml_base_recvreq.h"
+#include "opal/datatype/opal_datatype.h"
+#include "ompi/datatype/ompi_datatype.h"
 
 /*
  * Define ompi_field_offset() to be a debugging macro only -- just