cvs: /php3/functions cpdf.c mcrypt.c mhash.c pdf.c snmp.c
| From: | Kristian K�hntopp | Date: | Sun, 14 Nov 1999 11:41:15 +0000 |
| Subject: | cvs: /php3/functions cpdf.c mcrypt.c mhash.c pdf.c snmp.c | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-12511@lists.php.net to get a copy of this message | ||
kk Sun Nov 14 06:41:15 1999 EDT
Modified files:
/php3/functions cpdf.c mcrypt.c mhash.c pdf.c snmp.c
Log:
PHP3 references a number of include files from outside the PHP3 tree
using directives of the form '#include "file.h"'. This generates problematic
dependencies when using 'make depend'. This patch fixes this.
Index: php3/functions/cpdf.c
diff -u php3/functions/cpdf.c:1.18 php3/functions/cpdf.c:1.19
--- php3/functions/cpdf.c:1.18 Thu Nov 11 16:33:13 1999
+++ php3/functions/cpdf.c Sun Nov 14 06:41:14 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cpdf.c,v 1.18 1999/11/11 21:33:13 rasmus Exp $ */
+/* $Id: cpdf.c,v 1.19 1999/11/14 11:41:14 kk Exp $ */
/* cpdflib.h -- C language API definitions for ClibPDF library
* Copyright (C) 1998 FastIO Systems, All Rights Reserved.
*/
@@ -45,7 +45,7 @@
#include <math.h>
#include "php3_cpdf.h"
#if HAVE_LIBGD13
-#include "gd.h"
+#include <gd.h>
#endif
#ifdef HAVE_UNISTD_H
Index: php3/functions/mcrypt.c
diff -u php3/functions/mcrypt.c:1.11 php3/functions/mcrypt.c:1.12
--- php3/functions/mcrypt.c:1.11 Sun Oct 31 08:00:22 1999
+++ php3/functions/mcrypt.c Sun Nov 14 06:41:14 1999
@@ -32,11 +32,11 @@
#if HAVE_LIBMCRYPT
#include "php_mcrypt.h"
-#include "fcntl.h"
+#include <fcntl.h>
#define NON_FREE
#define MCRYPT2
-#include "mcrypt.h"
+#include <mcrypt.h>
function_entry mcrypt_functions[] = {
PHP_FE(mcrypt_ecb, NULL)
Index: php3/functions/mhash.c
diff -u php3/functions/mhash.c:1.2 php3/functions/mhash.c:1.3
--- php3/functions/mhash.c:1.2 Thu Jul 29 16:09:21 1999
+++ php3/functions/mhash.c Sun Nov 14 06:41:14 1999
@@ -33,7 +33,7 @@
#include "php_mhash.h"
-#include "mhash.h"
+#include <mhash.h>
function_entry mhash_functions[] = {
PHP_FE(mhash_get_block_size, NULL)
Index: php3/functions/pdf.c
diff -u php3/functions/pdf.c:1.53 php3/functions/pdf.c:1.54
--- php3/functions/pdf.c:1.53 Tue Sep 14 10:49:11 1999
+++ php3/functions/pdf.c Sun Nov 14 06:41:14 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdf.c,v 1.53 1999/09/14 14:49:11 steinm Exp $ */
+/* $Id: pdf.c,v 1.54 1999/11/14 11:41:14 kk Exp $ */
/* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
@@ -45,7 +45,7 @@
#include <math.h>
#include "php3_pdf.h"
#if HAVE_LIBGD13
-#include "gd.h"
+#include <gd.h>
#endif
#ifdef HAVE_UNISTD_H
Index: php3/functions/snmp.c
diff -u php3/functions/snmp.c:1.22 php3/functions/snmp.c:1.23
--- php3/functions/snmp.c:1.22 Fri Nov 12 16:43:25 1999
+++ php3/functions/snmp.c Sun Nov 14 06:41:14 1999
@@ -28,7 +28,7 @@
| Steven Lawrance <slawrance@technologist.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.22 1999/11/12 21:43:25 kk Exp $ */
+/* $Id: snmp.c,v 1.23 1999/11/14 11:41:14 kk Exp $ */
#include "php.h"
#include "internal_functions.h"
@@ -67,13 +67,13 @@
#endif
#endif
-#include "asn1.h"
-#include "snmp_api.h"
-#include "snmp_client.h"
-#include "snmp_impl.h"
-#include "snmp.h"
-#include "parse.h"
-#include "mib.h"
+#include <asn1.h>
+#include <snmp_api.h>
+#include <snmp_client.h>
+#include <snmp_impl.h>
+#include <snmp.h>
+#include <parse.h>
+#include <mib.h>
/* ucd-snmp 3.3.1 changed the name of a few #defines... They've been changed back to the
original ones in 3.5.3! */
#ifndef SNMP_MSG_GET