components/git/patches/barf.patch
author pkidd <patrick.kidd@oracle.com>
Wed, 22 Jun 2016 17:23:03 -0700
branchs11u3-sru
changeset 6270 774c76b1f10a
parent 5720 519e1bb835ee
permissions -rw-r--r--
build metadata for S11.3SRU10.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5720
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
Patch to allow the Studio compilers to compile.  Although the existing code
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
catches cases where you're using an older gcc that doesn't support the
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
feature, it omits the case where gcc is not the compiler and the feature
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
is not available.  This is suitable for upstream.
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
--- git-2.5.3/git-compat-util.h	Thu Sep 17 13:26:50 2015
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
+++ git-2.5.3/git-compat-util.h	Thu Sep 24 14:32:55 2015
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
@@ -32,6 +32,8 @@
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 # else
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
 #  define FLEX_ARRAY 0 /* older GNU extension */
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
 # endif
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
+#else
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
+# define BARF_UNLESS_AN_ARRAY(arr) 0
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
 #endif
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
 
519e1bb835ee 22854539 git 2.7.4
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
 /*