]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://github.com/krakjoe/phpdbg
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 24 Nov 2013 20:16:55 +0000 (20:16 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 24 Nov 2013 20:16:55 +0000 (20:16 +0000)
1  2 
phpdbg_utils.c
phpdbg_utils.h

diff --cc phpdbg_utils.c
Simple merge
diff --cc phpdbg_utils.h
index b85a76ae3a52ef2feb695bc25b6d6bce3b1e2373,399020f5344b86995dad0fefebb43293a2e875e2..e9c35d102da95e532279806de9251a5363ba6f26
@@@ -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_tphpdbg_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);