Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > VMS_impls > VMS__MC_shared_impl

diff VMS.h @ 205:cb888346c3e0

find changesets by author, revision, files, or words in the commit message
Changed include paths, but version still does not work because of accidental merge
author Merten Sach <msach@mailbox.tu-berlin.de>
date Fri, 17 Feb 2012 18:28:59 +0100
parents 6db9e4898978
children
line diff
     1.1 --- a/VMS.h	Sun Feb 12 01:49:33 2012 -0800
     1.2 +++ b/VMS.h	Fri Feb 17 18:28:59 2012 +0100
     1.3 @@ -11,10 +11,10 @@
     1.4  #define _GNU_SOURCE
     1.5  
     1.6  #include "VMS_primitive_data_types.h"
     1.7 -#include "../../C_Libraries/DynArray/DynArray.h"
     1.8 -#include "../../C_Libraries/Hash_impl/PrivateHash.h"
     1.9 -#include "../../C_Libraries/Histogram/Histogram.h"
    1.10 -#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
    1.11 +#include "C_Libraries/DynArray/DynArray.h"
    1.12 +#include "C_Libraries/Hash_impl/PrivateHash.h"
    1.13 +#include "C_Libraries/Histogram/Histogram.h"
    1.14 +#include "C_Libraries/Queue_impl/PrivateQueue.h"
    1.15  #include "vmalloc.h"
    1.16  
    1.17  #include <pthread.h>
    1.18 @@ -27,7 +27,6 @@
    1.19  #include "VMS_defs.h"
    1.20  
    1.21  
    1.22 -
    1.23  //================================ Typedefs =================================
    1.24  //
    1.25  typedef unsigned long long TSCount;
    1.26 @@ -50,6 +49,9 @@
    1.27  typedef void    VirtProcrFn      ( void *, SlaveVP * ); //initData, animPr
    1.28  typedef void  (*ResumeVPFnPtr)   ( SlaveVP *, void * );
    1.29  
    1.30 +//============================= Statistics ==================================
    1.31 +
    1.32 +inline TSCount getTSCount();
    1.33  
    1.34  //============= Request Related ===========
    1.35  //