Skip to content

Commit

Permalink
Fix use of EXTERN_C macros
Browse files Browse the repository at this point in the history
  • Loading branch information
Ard Biesheuvel committed Sep 2, 2003
1 parent dbdd5b4 commit e6ea5ca
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions main/php.h
Expand Up @@ -122,25 +122,25 @@
}

#ifndef HAVE_STRLCPY
BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
PHPAPI size_t php_strlcpy(char *dst, const char *src, size_t siz);
END_EXTERN_C();
END_EXTERN_C()
#undef strlcpy
#define strlcpy php_strlcpy
#endif

#ifndef HAVE_STRLCAT
BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
PHPAPI size_t php_strlcat(char *dst, const char *src, size_t siz);
END_EXTERN_C();
END_EXTERN_C()
#undef strlcat
#define strlcat php_strlcat
#endif

#ifndef HAVE_STRTOK_R
BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
char *strtok_r(char *s, const char *delim, char **last);
END_EXTERN_C();
END_EXTERN_C()
#endif

#ifndef HAVE_SOCKLEN_T
Expand Down Expand Up @@ -276,15 +276,15 @@ ssize_t pwrite(int, void *, size_t, off64_t);
ssize_t pread(int, void *, size_t, off64_t);
#endif

BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
void phperror(char *error);
PHPAPI int php_write(void *buf, uint size TSRMLS_DC);
PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
2);
PHPAPI void php_log_err(char *log_message TSRMLS_DC);
int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);
int cfgparse(void);
END_EXTERN_C();
END_EXTERN_C()

#define php_error zend_error

Expand All @@ -294,7 +294,7 @@ typedef enum {
EH_THROW
} error_handling_t;

BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry *exception_class TSRMLS_DC);
#define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)

Expand All @@ -313,7 +313,7 @@ PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1,
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5);
PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6);
END_EXTERN_C();
END_EXTERN_C()

#define php_error_docref php_error_docref0

Expand All @@ -327,7 +327,7 @@ END_EXTERN_C();
#define php_memnstr zend_memnstr

/* functions */
BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
int php_startup_internal_extensions(void);

int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
Expand All @@ -337,7 +337,7 @@ PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userda
PHPAPI int cfg_get_long(char *varname, long *result);
PHPAPI int cfg_get_double(char *varname, double *result);
PHPAPI int cfg_get_string(char *varname, char **result);
END_EXTERN_C();
END_EXTERN_C()

/* PHP-named Zend macro wrappers */
#define PHP_FN ZEND_FN
Expand Down
4 changes: 2 additions & 2 deletions main/php_ini.h
Expand Up @@ -23,12 +23,12 @@

#include "zend_ini.h"

BEGIN_EXTERN_C();
BEGIN_EXTERN_C()
int php_init_config();
int php_shutdown_config(void);
void php_ini_delayed_modules_startup(TSRMLS_D);
zval *cfg_get_entry(char *name, uint name_length);
END_EXTERN_C();
END_EXTERN_C()

#define PHP_INI_USER ZEND_INI_USER
#define PHP_INI_PERDIR ZEND_INI_PERDIR
Expand Down

0 comments on commit e6ea5ca

Please sign in to comment.