mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Don't attempt to define NULL if it is already set.
Approved by: maintainer (via e-mail)
This commit is contained in:
parent
bd36c88375
commit
c02ee4e453
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362526
2 changed files with 7 additions and 5 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= libvisual
|
PORTNAME= libvisual
|
||||||
PORTVERSION= 0.4.0
|
PORTVERSION= 0.4.0
|
||||||
PORTREVISION= 4
|
PORTREVISION= 5
|
||||||
CATEGORIES= graphics
|
CATEGORIES= graphics
|
||||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
|
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
|
||||||
PKGNAMESUFFIX= 04
|
PKGNAMESUFFIX= 04
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
--- lv_defines.h.orig 2006-01-22 13:23:37.000000000 +0000
|
--- libvisual/lv_defines.h.orig 2006-01-22 14:23:37.000000000 +0100
|
||||||
+++ libvisual/lv_defines.h 2014-06-24 19:56:46.961214708 +0100
|
+++ libvisual/lv_defines.h 2014-07-21 15:18:07.000000000 +0200
|
||||||
@@ -39,14 +39,13 @@
|
@@ -38,15 +38,14 @@
|
||||||
|
# define VISUAL_END_DECLS
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#ifdef NULL
|
-#ifdef NULL
|
||||||
-#undef NULL
|
-#undef NULL
|
||||||
|
+#ifndef NULL
|
||||||
+# ifndef __cplusplus
|
+# ifndef __cplusplus
|
||||||
+# define NULL ((void *) 0)
|
+# define NULL ((void *) 0)
|
||||||
+# else
|
+# else
|
||||||
|
|
Loading…
Add table
Reference in a new issue