diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-02-26 14:34:57 -0700 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-02-26 14:34:57 -0700 |
| commit | ed0ae62ad746d10fe546c900a42e55af5d05c227 (patch) | |
| tree | 3e743e4553ddc05a06ee3fe0303076a562e5fcac /src/mesa/shader/slang/slang_preprocess.h | |
| parent | 4e53ce81cfa2a98d045433ffbc4d295a239ad0b6 (diff) | |
| parent | ca279b80e686e2e590f1cf08ef22dabdead4d66f (diff) | |
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'src/mesa/shader/slang/slang_preprocess.h')
| -rw-r--r-- | src/mesa/shader/slang/slang_preprocess.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/mesa/shader/slang/slang_preprocess.h b/src/mesa/shader/slang/slang_preprocess.h index f83e6e6e3f..d8eb12e4ff 100644 --- a/src/mesa/shader/slang/slang_preprocess.h +++ b/src/mesa/shader/slang/slang_preprocess.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.6 + * Version: 6.5.3 * - * Copyright (C) 2005-2006 Brian Paul All Rights Reserved. + * Copyright (C) 2005-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -22,24 +22,19 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#if !defined SLANG_PREPROCESS_H +#ifndef SLANG_PREPROCESS_H #define SLANG_PREPROCESS_H #include "slang_compile.h" +#include "slang_log.h" -#if defined __cplusplus -extern "C" { -#endif -GLboolean +extern GLboolean _slang_preprocess_version (const char *, GLuint *, GLuint *, slang_info_log *); -GLboolean -_slang_preprocess_directives (slang_string *output, const char *input, slang_info_log *); +extern GLboolean +_slang_preprocess_directives (slang_string *output, const char *input, + slang_info_log *); -#ifdef __cplusplus -} -#endif - -#endif +#endif /* SLANG_PREPROCESS_H */ |