fmk Fri Jul 30 12:49:38 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/win32 globals.c php_win32_globals.h
Log:
Fix line endings
http://cvs.php.net/diff.php/php-src/win32/globals.c?r1=1.2.4.1&r2=1.2.4.2&ty=u
Index: php-src/win32/globals.c
diff -u php-src/win32/globals.c:1.2.4.1 php-src/win32/globals.c:1.2.4.2
--- php-src/win32/globals.c:1.2.4.1 Fri Jul 30 10:37:17 2004
+++ php-src/win32/globals.c Fri Jul 30 12:49:38 2004
@@ -1,51 +1,51 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2004 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Wez Furlong <[EMAIL PROTECTED]> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: globals.c,v 1.2.4.1 2004/07/30 14:37:17 wez Exp $ */
-
-#include "php.h"
-#include "php_win32_globals.h"
-
-#ifdef ZTS
-PHPAPI int php_win32_core_globals_id;
-#else
-php_win32_core_globals php_win32_core_globals;
-#endif
-
-void php_win32_core_globals_ctor(void *vg TSRMLS_DC)
-{
- php_win32_core_globals *wg = (php_win32_core_globals*)vg;
- memset(wg, 0, sizeof(*wg));
-}
-
-PHP_RSHUTDOWN_FUNCTION(win32_core_globals)
-{
- php_win32_core_globals *wg =
-#ifdef ZTS
- ts_resource(php_win32_core_globals_id)
-#else
- &php_win32_core_globals
-#endif
- ;
-
- STR_FREE(wg->login_name);
-
- memset(wg, 0, sizeof(*wg));
- return SUCCESS;
-}
-
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2004 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.0 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_0.txt. |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Wez Furlong <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: globals.c,v 1.2.4.2 2004/07/30 16:49:38 fmk Exp $ */
+
+#include "php.h"
+#include "php_win32_globals.h"
+
+#ifdef ZTS
+PHPAPI int php_win32_core_globals_id;
+#else
+php_win32_core_globals php_win32_core_globals;
+#endif
+
+void php_win32_core_globals_ctor(void *vg TSRMLS_DC)
+{
+ php_win32_core_globals *wg = (php_win32_core_globals*)vg;
+ memset(wg, 0, sizeof(*wg));
+}
+
+PHP_RSHUTDOWN_FUNCTION(win32_core_globals)
+{
+ php_win32_core_globals *wg =
+#ifdef ZTS
+ ts_resource(php_win32_core_globals_id)
+#else
+ &php_win32_core_globals
+#endif
+ ;
+
+ STR_FREE(wg->login_name);
+
+ memset(wg, 0, sizeof(*wg));
+ return SUCCESS;
+}
+
http://cvs.php.net/diff.php/php-src/win32/php_win32_globals.h?r1=1.1.4.1&r2=1.1.4.2&ty=u
Index: php-src/win32/php_win32_globals.h
diff -u php-src/win32/php_win32_globals.h:1.1.4.1
php-src/win32/php_win32_globals.h:1.1.4.2
--- php-src/win32/php_win32_globals.h:1.1.4.1 Fri Jul 30 10:37:17 2004
+++ php-src/win32/php_win32_globals.h Fri Jul 30 12:49:38 2004
@@ -1,58 +1,58 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2004 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | [EMAIL PROTECTED] so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Wez Furlong <[EMAIL PROTECTED]> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: php_win32_globals.h,v 1.1.4.1 2004/07/30 14:37:17 wez Exp $ */
-
-#ifndef PHP_WIN32_GLOBALS_H
-#define PHP_WIN32_GLOBALS_H
-
-/* misc globals for thread-safety under win32 */
-
-#include "pwd.h"
-
-typedef struct _php_win32_core_globals php_win32_core_globals;
-
-#ifdef ZTS
-# define PW32G(v) TSRMG(php_win32_core_globals_id,
php_win32_core_globals*, v)
-extern PHPAPI int php_win32_core_globals_id;
-#else
-# define PW32G(v) (php_win32_core_globals.v)
-extern PHPAPI struct _php_win32_core_globals php_win32_core_globals;
-#endif
-
-struct _php_win32_core_globals {
- /* syslog */
- char *log_header;
- HANDLE log_source;
-
- /* getpwuid */
- struct passwd pwd;
-
- /* getlogin */
- char *login_name;
-
- /* time */
- struct timeval starttime;
- __int64 lasttime, freq;
-};
-
-void php_win32_core_globals_ctor(void *vg TSRMLS_DC);
-PHP_RSHUTDOWN_FUNCTION(win32_core_globals);
-
-#endif
-
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2004 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.0 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_0.txt. |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Wez Furlong <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: php_win32_globals.h,v 1.1.4.2 2004/07/30 16:49:38 fmk Exp $ */
+
+#ifndef PHP_WIN32_GLOBALS_H
+#define PHP_WIN32_GLOBALS_H
+
+/* misc globals for thread-safety under win32 */
+
+#include "pwd.h"
+
+typedef struct _php_win32_core_globals php_win32_core_globals;
+
+#ifdef ZTS
+# define PW32G(v) TSRMG(php_win32_core_globals_id,
php_win32_core_globals*, v)
+extern PHPAPI int php_win32_core_globals_id;
+#else
+# define PW32G(v) (php_win32_core_globals.v)
+extern PHPAPI struct _php_win32_core_globals php_win32_core_globals;
+#endif
+
+struct _php_win32_core_globals {
+ /* syslog */
+ char *log_header;
+ HANDLE log_source;
+
+ /* getpwuid */
+ struct passwd pwd;
+
+ /* getlogin */
+ char *login_name;
+
+ /* time */
+ struct timeval starttime;
+ __int64 lasttime, freq;
+};
+
+void php_win32_core_globals_ctor(void *vg TSRMLS_DC);
+PHP_RSHUTDOWN_FUNCTION(win32_core_globals);
+
+#endif
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
