From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 24 Nov 2013 20:16:55 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=beea71bd25d22f8635bd2528c90b6850d80a0136;p=php

Merge branch 'master' of https://github.com/krakjoe/phpdbg
---

beea71bd25d22f8635bd2528c90b6850d80a0136
diff --cc phpdbg_utils.h
index b85a76ae3a,399020f534..e9c35d102d
--- 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);