Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/jansson/patches/002-usr-include-jansson.patch
author boris.chiu@oracle.com
Mon, 03 Oct 2016 15:42:45 -0700
branchs11u3-sru
changeset 7024 84310b997802
parent 4141 c6a303a2f8c5
permissions -rw-r--r--
24516419 umad_get_ca() should pass the PF node_guid for CX3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4141
c6a303a2f8c5 PSARC/2014/362 Jansson
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset 
     1
 
Tomas Heran <[email protected]>
c6a303a2f8c5 PSARC/2014/362 Jansson
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset 
     2
 
Reported upstream as https://github.com/akheron/jansson/issues/209
c6a303a2f8c5 PSARC/2014/362 Jansson
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset 
     3
 












c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     4


diff -r 10395313a7ae -r 1834d7632071 src/jansson.h













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     5


--- a/src/jansson.h	Tue Oct 28 17:05:35 2014 +0100













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     6


+++ b/src/jansson.h	Thu Nov 27 11:50:46 2014 +0100













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     7


@@ -12,7 +12,7 @@













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     8


 #include <stdlib.h>  /* for size_t */













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




     9


 #include <stdarg.h>













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    10


 













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    11


-#include <jansson_config.h>













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    12


+#include "jansson_config.h"













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    13


 













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    14


 #ifdef __cplusplus













c6a303a2f8c5
PSARC/2014/362 Jansson



Tomas Heran <tomas.heran@oracle.com>


parents: 

diff
changeset




    15


 extern "C" {















upstream/oracle/userland-gate