[GRASS-CVS] markus: grass6/lib/vector/dglib graph.h, 1.9,
1.9.8.1 graph_v1.h, 1.4, 1.4.8.1 graph_v2.h, 1.1,
1.1.8.1 heap.h, 1.3, 1.3.8.1 helpers.h, 1.2, 1.2.8.1 tree.h,
1.4, 1.4.8.1 type.h, 1.3, 1.3.8.1
grass at intevation.de
grass at intevation.de
Sun Nov 18 14:55:42 EST 2007
Author: markus
Update of /grassrepository/grass6/lib/vector/dglib
In directory doto:/tmp/cvs-serv23075
Modified Files:
Tag: releasebranch_6_3
graph.h graph_v1.h graph_v2.h heap.h helpers.h tree.h type.h
Log Message:
Remove __{BEGIN,END}_DECLS macros; Remove cruft from headers (merge from HEAD)
Index: graph.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/graph.h,v
retrieving revision 1.9
retrieving revision 1.9.8.1
diff -u -d -r1.9 -r1.9.8.1
--- graph.h 6 Aug 2002 15:49:51 -0000 1.9
+++ graph.h 18 Nov 2007 19:55:40 -0000 1.9.8.1
@@ -30,8 +30,6 @@
#include "heap.h"
#include "tree.h"
-__BEGIN_DECLS
-
/*
* Graph State bitmask - returned by dglGet_State() function
*/
@@ -541,5 +539,4 @@
dglInt32_t *dglEdge_T_First ( dglEdgeTraverser_s * pTraverser );
dglInt32_t *dglEdge_T_Next ( dglEdgeTraverser_s * pTraverser );
-__END_DECLS
#endif
Index: graph_v1.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/graph_v1.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -d -r1.4 -r1.4.8.1
--- graph_v1.h 6 Aug 2002 15:49:51 -0000 1.4
+++ graph_v1.h 18 Nov 2007 19:55:40 -0000 1.4.8.1
@@ -27,8 +27,6 @@
#include <time.h>
#endif
-__BEGIN_DECLS
-
/*
* Node macros - addresses in a flat node
*/
@@ -268,5 +266,4 @@
-__END_DECLS
#endif
Index: graph_v2.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/graph_v2.h,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- graph_v2.h 6 Aug 2002 15:49:51 -0000 1.1
+++ graph_v2.h 18 Nov 2007 19:55:40 -0000 1.1.8.1
@@ -27,8 +27,6 @@
#include <time.h>
#endif
-__BEGIN_DECLS
-
/*
* Node macros - addresses in a flat node
*/
@@ -272,7 +270,4 @@
dglInt32_t * dgl_edge_t_next_V2 ( dglEdgeTraverser_s * pT );
-
-
-__END_DECLS
#endif
Index: heap.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/heap.h,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -d -r1.3 -r1.3.8.1
--- heap.h 6 Aug 2002 15:49:51 -0000 1.3
+++ heap.h 18 Nov 2007 19:55:40 -0000 1.3.8.1
@@ -22,8 +22,6 @@
#ifndef _DGL_HEAP_H_
#define _DGL_HEAP_H_
-__BEGIN_DECLS
-
typedef union _dglHeapData
{
void * pv;
@@ -87,5 +85,4 @@
dglHeapNode_s * pnoderet
);
-__END_DECLS
#endif
Index: helpers.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/helpers.h,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -d -r1.2 -r1.2.8.1
--- helpers.h 6 Aug 2002 15:49:51 -0000 1.2
+++ helpers.h 18 Nov 2007 19:55:40 -0000 1.2.8.1
@@ -33,5 +33,4 @@
extern int dgl_edge_prioritizer_add(dglGraph_s * pG, dglInt32_t nId, dglInt32_t nPriId);
extern void * dgl_reduce_edgeset(void * pvSet, int * pc, dglInt32_t nKey);
-__END_DECLS
#endif
Index: tree.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/tree.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -d -r1.4 -r1.4.8.1
--- tree.h 6 Aug 2002 15:49:51 -0000 1.4
+++ tree.h 18 Nov 2007 19:55:40 -0000 1.4.8.1
@@ -22,9 +22,6 @@
#ifndef _DGL_TREE_H_
#define _DGL_TREE_H_
-__BEGIN_DECLS
-
-
#include "avl.h"
#include "tavl.h"
@@ -165,7 +162,5 @@
extern int dglTreeEdgePri32Compare( const void * pvEdgePri32A , const void * pvEdgePri32B , void * pvParam );
extern dglTreeEdgePri32_s * dglTreeEdgePri32Add( void * pvAVL, dglInt32_t nKey );
-
-__END_DECLS
#endif
Index: type.h
===================================================================
RCS file: /grassrepository/grass6/lib/vector/dglib/type.h,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -d -r1.3 -r1.3.8.1
--- type.h 6 Aug 2002 15:49:51 -0000 1.3
+++ type.h 18 Nov 2007 19:55:40 -0000 1.3.8.1
@@ -23,34 +23,6 @@
#ifndef _DGL_TYPE_H_
#define _DGL_TYPE_H_ 1
-/* __BEGIN_DECLS should be used at the beginning of your declarations,
- so that C++ compilers don't mangle their names. Use __END_DECLS at
- the end of C declarations. */
-#undef __BEGIN_DECLS
-#undef __END_DECLS
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
-#endif
-
-/* __P is a macro used to wrap function prototypes, so that compilers
- that don't understand ANSI C prototypes still work, and ANSI C
- compilers can issue warnings about type mismatches. */
-#undef __P
-#if defined (__STDC__) || defined (_AIX) \
- || (defined (__mips) && defined (_SYSTYPE_SVR4)) \
- || defined(WIN32) || defined(__cplusplus)
-# define __P(protos) protos
-#else
-# define __P(protos) ()
-#endif
-
-
-__BEGIN_DECLS
-
/*
* local endianess
*/
@@ -65,7 +37,4 @@
typedef long dglInt32_t;
typedef long long dglInt64_t;
-
-__END_DECLS /* _GN_TYPE_H_ */
-
#endif
More information about the grass-commit
mailing list