diff options
author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /mesalib/src/glu/sgi/libnurbs | |
parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/glu/sgi/libnurbs')
-rw-r--r-- | mesalib/src/glu/sgi/libnurbs/internals/bin.cc | 2 | ||||
-rw-r--r-- | mesalib/src/glu/sgi/libnurbs/internals/bin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glu/sgi/libnurbs/internals/bin.cc b/mesalib/src/glu/sgi/libnurbs/internals/bin.cc index ff75b86be..d85bd80dc 100644 --- a/mesalib/src/glu/sgi/libnurbs/internals/bin.cc +++ b/mesalib/src/glu/sgi/libnurbs/internals/bin.cc @@ -119,7 +119,7 @@ Bin::adopt() */ void -Bin::show( char *name ) +Bin::show( const char *name ) { #ifndef NDEBUG _glu_dprintf( "%s\n", name ); diff --git a/mesalib/src/glu/sgi/libnurbs/internals/bin.h b/mesalib/src/glu/sgi/libnurbs/internals/bin.h index 2f976eb9b..dd0f878f6 100644 --- a/mesalib/src/glu/sgi/libnurbs/internals/bin.h +++ b/mesalib/src/glu/sgi/libnurbs/internals/bin.h @@ -57,7 +57,7 @@ public: int numarcs( void ); void adopt( void ); void markall( void ); - void show( char * ); + void show( const char * ); void listBezier( void ); }; |