Show
Ignore:
Timestamp:
03/22/10 15:55:52 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ply/ply.h

    r10012 r11274  
    3434#define __PLY_H__ 
    3535 
    36 #ifdef __cplusplus 
    37 extern "C" { 
    38 #endif 
     36// include to quieten down silly VS warnings 
     37#include <osg/Export> 
    3938 
    4039#include <stdio.h> 
     
    7069typedef struct PlyProperty {    /* description of a property */ 
    7170 
    72   char *name;                           /* property name */ 
     71  const char *name;                           /* property name */ 
    7372  int external_type;                    /* file's data type */ 
    7473  int internal_type;                    /* program's data type */ 
     
    151150extern PlyProperty **ply_get_element_description(PlyFile *, char *, int*, int*); 
    152151extern void ply_get_element_setup( PlyFile *, char *, int, PlyProperty *); 
    153 extern void ply_get_property(PlyFile *, char *, PlyProperty *); 
     152extern void ply_get_property(PlyFile *, const char *, PlyProperty *); 
    154153extern PlyOtherProp *ply_get_other_properties(PlyFile *, char *, int); 
    155154extern void ply_get_element(PlyFile *, void *); 
     
    165164extern int equal_strings(const char *, const char *); 
    166165 
    167  
    168 #ifdef __cplusplus 
    169 } 
    170 #endif 
    171166#endif /* !__PLY_H__ */ 
    172167