Fix typo with #elif. PHP strings don't work with size_t. Cast from si…

…ze_t to int.
php · Feb 26, 2013 · ea88bda · ea88bda
1 parent 2cc4c52
commit ea88bda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c
@@ -109,7 +109,7 @@ extern char** environ;
 static char windows_error_details[64];
 static char ps_buffer[MAX_PATH];
 static const size_t ps_buffer_size = MAX_PATH;
-#elif PS_USE_CLOBBER_ARGV
+#elif defined(PS_USE_CLOBBER_ARGV)
 static char *ps_buffer;         /* will point to argv area */
 static size_t ps_buffer_size;   /* space determined at run time */
 #else
@@ -372,7 +372,7 @@ int set_ps_title(const char* title)
  * length into *displen.
  * The return code indicates the error.
  */
-int get_ps_title(size_t *displen, const char** string)
+int get_ps_title(int *displen, const char** string)
 {
     int rc = is_ps_title_available();
     if (rc != PS_TITLE_SUCCESS)
@@ -382,7 +382,7 @@ int get_ps_title(size_t *displen, const char** string)
     if (!(ps_buffer_cur_len = GetConsoleTitle(ps_buffer, ps_buffer_size)))
         return PS_TITLE_WINDOWS_ERROR;
 #endif
-    *displen = ps_buffer_cur_len;
+    *displen = (int)ps_buffer_cur_len;
     *string = ps_buffer;
     return PS_TITLE_SUCCESS;
 }

diff --git a/sapi/cli/ps_title.h b/sapi/cli/ps_title.h
@@ -31,7 +31,7 @@ extern char** save_ps_args(int argc, char** argv);
 
 extern int set_ps_title(const char* new_str);
 
-extern int get_ps_title(size_t* displen, const char** string);
+extern int get_ps_title(int* displen, const char** string);
 
 extern const char* ps_title_errno(int rc);