com php-src: adjust pid_t declaration so it doesn't conflict with apache one: main/win95nt.h
| From: | Anatol Belski | Date: | Fri, 07 Nov 2014 09:18:09 +0000 |
| Subject: | com php-src: adjust pid_t declaration so it doesn't conflict with apache one: main/win95nt.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82982@lists.php.net to get a copy of this message | ||
Commit: 936575c2e20230800ca1a50110100034da42f599
Author: Anatol Belski <ab@php.net> Fri, 7 Nov 2014 00:57:15 +0100
Parents: 1310bb5e2ec3ab428b26396237dce82a506ba2b5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=936575c2e20230800ca1a50110100034da42f599
Log:
adjust pid_t declaration so it doesn't conflict with apache one
Changed paths:
M main/win95nt.h
Diff:
diff --git a/main/win95nt.h b/main/win95nt.h
index 76bec05..febffec 100644
--- a/main/win95nt.h
+++ b/main/win95nt.h
@@ -55,7 +55,7 @@ typedef char * caddr_t;
typedef unsigned int uint;
typedef unsigned long ulong;
#if !NSAPI
-typedef long pid_t;
+typedef int pid_t;
#endif
/* missing in vc5 math.h */