Changeset 11274 for OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/ply.h

Timestamp:

03/22/10 15:55:52 (3 years ago)

Author:

paulmartz

Message:

2.8 branch: Hm, mysteriously, the ply plugin seems to be missing changes that were previously merged. This commit brings them up to date with svn trunk as of r11237.

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/ply.h (modified) (4 diffs)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/ply.h

@@ -34 +34 @@
 #define __PLY_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+// include to quieten down silly VS warnings
+#include <osg/Export>
 
 #include <stdio.h>
@@ -70 +69 @@
 typedef struct PlyProperty {    /* description of a property */
 
-  char *name;                           /* property name */
+  const char *name;                           /* property name */
   int external_type;                    /* file's data type */
   int internal_type;                    /* program's data type */
@@ -151 +150 @@
 extern PlyProperty **ply_get_element_description(PlyFile *, char *, int*, int*);
 extern void ply_get_element_setup( PlyFile *, char *, int, PlyProperty *);
-extern void ply_get_property(PlyFile *, char *, PlyProperty *);
+extern void ply_get_property(PlyFile *, const char *, PlyProperty *);
 extern PlyOtherProp *ply_get_other_properties(PlyFile *, char *, int);
 extern void ply_get_element(PlyFile *, void *);
@@ -165 +164 @@
 extern int equal_strings(const char *, const char *);
 
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* !__PLY_H__ */