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/mesa/program/prog_parameter.h | |
| 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/mesa/program/prog_parameter.h')
| -rw-r--r-- | mesalib/src/mesa/program/prog_parameter.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/program/prog_parameter.h b/mesalib/src/mesa/program/prog_parameter.h index a6793d0d8..3c6dc8cf9 100644 --- a/mesalib/src/mesa/program/prog_parameter.h +++ b/mesalib/src/mesa/program/prog_parameter.h @@ -35,6 +35,11 @@ #include "prog_statevars.h" +#ifdef __cplusplus +extern "C" { +#endif + + /** * Program parameter flags */ @@ -178,4 +183,8 @@ _mesa_num_parameters_of_type(const struct gl_program_parameter_list *list, gl_register_file type); +#ifdef __cplusplus +} +#endif + #endif /* PROG_PARAMETER_H */ |