JORTE: update license headers and clean-up includes

[orte.git] / orte / include / orte_headers.h

diff --git a/orte/include/orte_headers.h b/orte/include/orte_headers.h
index 93afa1458b0b69c204d7efa86be4c49523ef39ff..a22f5d71f52f0551fbf664b1ae4df655fbdf72e5 100644 (file)
--- a/orte/include/orte_headers.h
+++ b/orte/include/orte_headers.h
@@ -1,9 +1,18 @@
 /*
  *  $Id: orte_headers.h,v 0.0.0.1       2003/08/21 
  *
- *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
- *
- *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
+ *  -------------------------------------------------------------------  
+ *                                ORTE                                 
+ *                      Open Real-Time Ethernet                       
+ *                                                                    
+ *                      Copyright (C) 2001-2006                       
+ *  Department of Control Engineering FEE CTU Prague, Czech Republic  
+ *                      http://dce.felk.cvut.cz                       
+ *                      http://www.ocera.org                          
+ *                                                                    
+ *  Author:             Petr Smolik    petr.smolik@wo.cz             
+ *  Advisor:            Pavel Pisa                                   
+ *  Project Responsible: Zdenek Hanzalek                              
  *  --------------------------------------------------------------------
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,8 +34,14 @@
 extern "C" {
 #endif
 
+#ifdef __ANDROID__
+  #define HAVE_CONFIG_H
+#endif
+
 #if defined _MSC_VER
   #include "orte/ew_types.h"
+#elif defined(__ANDROID__)
+  #include "orte/orte_config_android.h"
 #elif defined(HAVE_CONFIG_H) || defined(OMK_FOR_USER)  || defined(OMK_FOR_KERNEL)
   #include "orte/orte_config.h"
 #else
@@ -185,7 +200,9 @@ extern "C" {
   #ifndef __GETOPT_H__  //mingw
     #include <win32/getopt.h>
   #endif
-  #include <win32/timeval.h>
+  #ifndef HAVE_TIMEVAL_H
+    #include <win32/timeval.h>
+  #endif
   #include <orte/ew_types.h>
   #define ioctl ioctlsocket
 #elif defined CONFIG_ORTE_RTL
@@ -230,7 +247,7 @@ extern "C" {
   #include <win32/timeval.h>
   #include <win32/getopt.h>
   #define ioctl ioctlsocket
-  #define ORTE_PACKAGE_STRING "orte 0.3.0"
+  #define ORTE_PACKAGE_STRING "orte 0.3.3"
   #define CONFIG_ORTE_WIN
 #endif