Sfoglia il codice sorgente

dglib: fix for sizeof(long) != sizeof(long *)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@71267 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 7 anni fa
parent
commit
47806a37d1
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 2 2
      lib/vector/dglib/graph_v1.h
  2. 2 2
      lib/vector/dglib/graph_v2.h

+ 2 - 2
lib/vector/dglib/graph_v1.h

@@ -103,13 +103,13 @@
  * Node Buffer Utilities
  */
 #define DGL_NODEBUFFER_SHIFT_v1(pgrp,o)		((dglInt32_t*)((pgrp)->pNodeBuffer + (o)))
-#define DGL_NODEBUFFER_OFFSET_v1(pgrp,p)	((dglInt32_t)p - (dglInt32_t)(pgrp)->pNodeBuffer)
+#define DGL_NODEBUFFER_OFFSET_v1(pgrp,p)	((dglInt32_t)(p - (dglInt32_t *)(pgrp)->pNodeBuffer))
 
 /*
  * Edge Buffer Utilities
  */
 #define DGL_EDGEBUFFER_SHIFT_v1(pgrp,o)		((dglInt32_t*)((pgrp)->pEdgeBuffer + (o)))
-#define DGL_EDGEBUFFER_OFFSET_v1(pgrp,pl)	((dglInt32_t)pl - (dglInt32_t)(pgrp)->pEdgeBuffer)
+#define DGL_EDGEBUFFER_OFFSET_v1(pgrp,pl)	((dglInt32_t)(pl - (dglInt32_t *)(pgrp)->pEdgeBuffer))
 
 
 

+ 2 - 2
lib/vector/dglib/graph_v2.h

@@ -106,13 +106,13 @@
  * Node Buffer Utilities
  */
 #define DGL_NODEBUFFER_SHIFT_v2(pgrp,o)		((dglInt32_t*)((pgrp)->pNodeBuffer + (o)))
-#define DGL_NODEBUFFER_OFFSET_v2(pgrp,p)		((dglInt32_t)p - (dglInt32_t)(pgrp)->pNodeBuffer)
+#define DGL_NODEBUFFER_OFFSET_v2(pgrp,p)		((dglInt32_t)(p - (dglInt32_t *)(pgrp)->pNodeBuffer))
 
 /*
  * Edge Buffer Utilities
  */
 #define DGL_EDGEBUFFER_SHIFT_v2(pgrp,o)		((dglInt32_t*)((pgrp)->pEdgeBuffer + (o)))
-#define DGL_EDGEBUFFER_OFFSET_v2(pgrp,pl)		((dglInt32_t)pl - (dglInt32_t)(pgrp)->pEdgeBuffer)
+#define DGL_EDGEBUFFER_OFFSET_v2(pgrp,pl)		((dglInt32_t)(pl - (dglInt32_t *)(pgrp)->pEdgeBuffer))