Bugfix (Ticket #1447): Removed included system headers inside 'extern "C" {}'
This commit was SVN r19287.
Этот коммит содержится в:
родитель
4a2cf9b9b9
Коммит
a62f421d2b
@ -18,6 +18,9 @@
|
||||
#include "OTF_inttypes.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* *** Definition OTF_CopyHandler_r *** ************************************* */
|
||||
|
||||
@ -144,5 +147,9 @@ int OTF_CopyHandler_FileGroupOperationSummary( void* userData, uint64_t time,
|
||||
uint64_t nread, uint64_t nwrite, uint64_t nseek, uint64_t bytesread,
|
||||
uint64_t byteswrite );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_COPYOTF_CopyHandler_R_H */
|
||||
|
||||
|
@ -20,6 +20,10 @@
|
||||
#include "OTF_Filenames.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** mode determining what to do with a file */
|
||||
enum enum_OTF_FileMode {
|
||||
|
||||
@ -85,4 +89,8 @@ void OTF_File_setZBufferSize( OTF_File* file, uint32_t size );
|
||||
OTF_File* OTF_File_open_zlevel( const char* filename, OTF_FileManager* manager,
|
||||
OTF_FileMode mode, OTF_FileCompression compression );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_FILE_H */
|
||||
|
@ -32,6 +32,10 @@
|
||||
#include "OTF_inttypes.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
struct struct_OTF_File;
|
||||
typedef struct struct_OTF_File OTF_File;
|
||||
|
||||
@ -73,6 +77,9 @@ int OTF_FileManager_touchFile( OTF_FileManager* m, OTF_File* file );
|
||||
internally. Return 1 on success, 0 otherwise. */
|
||||
int OTF_FileManager_suspendFile( OTF_FileManager* m, OTF_File* file );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_FILEMANAGER_H */
|
||||
|
||||
|
@ -20,6 +20,10 @@
|
||||
#include "OTF_Definitions.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/*#define OTF_FILETYPE_MASTER 0
|
||||
#define OTF_FILETYPE_GLOBAL_DEF 1
|
||||
#define OTF_FILETYPE_DEF 2
|
||||
@ -59,4 +63,8 @@ char* OTF_stripFilename( const char* filename );
|
||||
/** DEPRICATED Check whether a file exists or not. Return 1 on success. */
|
||||
int OTF_fileExists( const char* filename );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_FILENAMES */
|
||||
|
@ -40,6 +40,10 @@
|
||||
#include "OTF_Writer.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** Generic function pointer for OTF record handlers. \ingroup ha*/
|
||||
typedef int (OTF_FunctionPointer) ( void *userData, ... );
|
||||
|
||||
@ -1058,5 +1062,9 @@ int OTF_Handler_UnknownRecord( void *userData,
|
||||
uint64_t value );
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_HANDLERARRAY_H */
|
||||
|
||||
|
@ -126,6 +126,10 @@
|
||||
#include "OTF_RBuffer.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** entry for 1:n mapping */
|
||||
struct struct_OTF_MapEntry {
|
||||
|
||||
@ -451,5 +455,9 @@ uint32_t* OTF_MasterControl_getValues( OTF_MasterControl* mc,
|
||||
uint32_t OTF_MasterControl_getNewStreamId( OTF_MasterControl* mc );
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_MASTERCONTROL_H */
|
||||
|
||||
|
@ -19,6 +19,10 @@
|
||||
#include "OTF_HandlerArray.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** Parse one event record from buffer and call the appropriate
|
||||
function - internal use only. */
|
||||
int OTF_Reader_parseEventRecord( OTF_RBuffer* buffer,
|
||||
@ -49,5 +53,8 @@ int OTF_Reader_readUnknownRecord( OTF_RBuffer* buffer,
|
||||
int OTF_Reader_readUnknownDefRecord( OTF_RBuffer* buffer,
|
||||
OTF_HandlerArray* handlers, uint32_t streamid );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_PARSE_H */
|
||||
|
@ -20,9 +20,7 @@
|
||||
#define OTF_PLATFORM_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN extern "C"
|
||||
#else
|
||||
#define EXTERN extern
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* if you know (for sure) of more compilers supporting __FUNCTION__,
|
||||
@ -84,6 +82,10 @@
|
||||
|
||||
#endif
|
||||
|
||||
EXTERN char *OTF_strdup( const char*s );
|
||||
char *OTF_strdup( const char*s );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_PLATFORM_H */
|
||||
|
@ -26,6 +26,10 @@
|
||||
#include "OTF_File.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
struct struct_OTF_RBuffer {
|
||||
|
||||
|
||||
@ -206,5 +210,9 @@ uint64_t OTF_RBuffer_getFileSize( OTF_RBuffer* rbuffer );
|
||||
/** Returns the fileposition of the file attached to this buffer */
|
||||
uint64_t OTF_RBuffer_getFilePos( OTF_RBuffer* rbuffer );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_RBUFFER_H */
|
||||
|
||||
|
@ -120,15 +120,16 @@ case. */
|
||||
#include "OTF_inttypes.h"
|
||||
|
||||
|
||||
struct struct_OTF_Reader;
|
||||
|
||||
|
||||
#include "OTF_FileManager.h"
|
||||
#include "OTF_RBuffer.h"
|
||||
#include "OTF_Filenames.h"
|
||||
#include "OTF_HandlerArray.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
struct struct_OTF_RStream {
|
||||
|
||||
|
||||
@ -613,5 +614,8 @@ uint8_t OTF_RStream_snapshotBytesProgress( OTF_RStream* rstream,
|
||||
uint8_t OTF_RStream_statisticBytesProgress( OTF_RStream* rstream,
|
||||
uint64_t* minimum, uint64_t* current, uint64_t* maximum );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_RSTREAM_H */
|
||||
|
@ -28,6 +28,10 @@
|
||||
#include "OTF_HandlerArray.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** \defgroup reader Reader Interface
|
||||
*
|
||||
* The reader provides high level read access to traces
|
||||
@ -794,5 +798,8 @@ uint8_t OTF_Reader_snapshotBytesProgress( OTF_Reader* reader,
|
||||
uint8_t OTF_Reader_statisticBytesProgress( OTF_Reader* reader,
|
||||
uint64_t* minimum, uint64_t* current, uint64_t* maximum );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_READER_H */
|
||||
|
@ -27,6 +27,10 @@
|
||||
#include "OTF_Filenames.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
struct struct_OTF_WBuffer {
|
||||
|
||||
|
||||
@ -122,5 +126,9 @@ uint32_t OTF_WBuffer_writeNewline( OTF_WBuffer* wbuffer );
|
||||
OTF_WBuffer* OTF_WBuffer_open_zlevel( const char* filename,
|
||||
OTF_FileManager* manager, OTF_FileCompression compression );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_WBUFFER_H */
|
||||
|
||||
|
@ -88,6 +88,10 @@
|
||||
#include "OTF_Filenames.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
struct struct_OTF_WStream {
|
||||
|
||||
|
||||
@ -528,5 +532,9 @@ int OTF_WStream_writeCollOpSummary( OTF_WStream* wstream,
|
||||
uint64_t bytes_sent, uint64_t bytes_recved );
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_WSTREAM_H */
|
||||
|
||||
|
@ -89,6 +89,10 @@
|
||||
#include "OTF_WStream.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** writer object \ingroup writer */
|
||||
typedef struct struct_OTF_Writer OTF_Writer;
|
||||
|
||||
@ -1168,6 +1172,9 @@ uint32_t OTF_Writer_mapProcess( OTF_Writer* writer, uint32_t processId );
|
||||
create one and append it to 'streams'. \ingroup writer */
|
||||
OTF_WStream* OTF_Writer_getStream( OTF_Writer* writer, uint32_t stream );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_WRITER_H */
|
||||
|
||||
|
@ -72,6 +72,10 @@
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/** Converts unsigned integers of 8, 16, 32 or 64 bit length into OTF counter values. */
|
||||
uint64_t OTF_Unsigned2Counter( uint64_t value );
|
||||
/** Converts OTF counter values to unsigned integers of 8, 16, 32 or 64 bit length. */
|
||||
@ -95,5 +99,9 @@ uint64_t OTF_Double2Counter( double value );
|
||||
/** Converts OTF counter values to double precision floating point values. */
|
||||
double OTF_Counter2Double( uint64_t value );
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* OTF_INTTYPES_H */
|
||||
|
||||
|
@ -73,11 +73,6 @@
|
||||
#define OTF_H
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
#include "OTF_Definitions.h"
|
||||
#include "OTF_FileManager.h"
|
||||
#include "OTF_Filenames.h"
|
||||
@ -89,10 +84,5 @@ extern "C" {
|
||||
#include "OTF_Writer.h"
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
#endif /* OTF_H */
|
||||
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user