From: Pierre Joye <pajoye@php.net>
Date: Wed, 27 Jan 2010 10:36:03 +0000 (+0000)
Subject: - #50854, fix build on non windows, svn merge is useless.
X-Git-Tag: php-5.4.0alpha1~191^2~2029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34930061d8bfbd6c1e19ac2a40fbdf9d4d32b8fd;p=php

- #50854, fix build on non windows, svn merge is useless.
---

diff --git a/main/php.h b/main/php.h
index da208e48e0..3e423fb42d 100644
--- a/main/php.h
+++ b/main/php.h
@@ -305,8 +305,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
 /* PHPAPI void php_error(int type, const char *format, ...); */
 PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...);
 PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...);
-#ifdef PHP_WIN32
+
 PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...);
+#ifdef PHP_WIN32
 PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC);
 #endif
 END_EXTERN_C()