com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg_utils.c phpdbg_utils.h
| From: | Bob Weinand | Date: | Sun, 24 Nov 2013 20:16:55 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg_utils.c phpdbg_utils.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74624@lists.php.net to get a copy of this message | ||
Commit: beea71bd25d22f8635bd2528c90b6850d80a0136
Author: krakjoe <joe.watkins@live.co.uk> Sun, 24 Nov 2013 20:16:55 +0000
Parents: 5596b2e7163dfa2f73b0a8a3c7af0963a7b917c6 ae7d408acc1242098ae9aeec94ee2874592ff950
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=beea71bd25d22f8635bd2528c90b6850d80a0136
Log:
Merge branch 'master' of https://github.com/krakjoe/phpdbg
Changed paths:
MM phpdbg_utils.c
MM phpdbg_utils.h
Diff:
diff --cc phpdbg_utils.h
index b85a76a,399020f..e9c35d1
--- a/phpdbg_utils.h
+++ b/phpdbg_utils.h
@@@ -94,10 -94,9 +94,10 @@@ typedef struct _phpdbg_color_t
const char code[PHPDBG_COLOR_LEN];
} phpdbg_color_t;
- PHPDBG_API const phpdbg_color_t* phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC);
+ PHPDBG_API const phpdbg_color_t *phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC);
PHPDBG_API void phpdbg_set_color(int element, const phpdbg_color_t *color TSRMLS_DC);
-PHPDBG_API void phpdbg_set_color_ex(int element, const char *name, size_t name_length TSRMLS_DC);
/* }}} */
+PHPDBG_API void phpdbg_set_color_ex(int element, const char *name, size_t name_length TSRMLS_DC);
+PHPDBG_API const phpdbg_color_t* phpdbg_get_colors(TSRMLS_D); /* }}} */
/* {{{ Prompt Management */
PHPDBG_API void phpdbg_set_prompt(const char* TSRMLS_DC);