diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2018-12-02 10:39:52 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2018-12-02 10:39:52 +0100 |
| commit | d6c7189f05f6b0d380da2888288d7653ef86116c (patch) | |
| tree | 85e8a8d3e8772a879551a9c462aaf3300f3d0d7c /storage/connect/tabjson.h | |
| parent | ddff78ab18fd31f975dba5d55daa1b15f171c97d (diff) | |
| parent | 0fb92dddf96eccde87ec600b98aec53d3d37aa2c (diff) | |
| download | mariadb-git-d6c7189f05f6b0d380da2888288d7653ef86116c.tar.gz | |
Merge branch 'ob-10.1' into 10.1
Diffstat (limited to 'storage/connect/tabjson.h')
| -rw-r--r-- | storage/connect/tabjson.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h index 2ff72905e86..fcbfe4ed1ec 100644 --- a/storage/connect/tabjson.h +++ b/storage/connect/tabjson.h @@ -1,11 +1,11 @@ /*************** tabjson H Declares Source Code File (.H) **************/ /* Name: tabjson.h Version 1.3 */ /* */ -/* (C) Copyright to the author Olivier BERTRAND 2014 - 2017 */ +/* (C) Copyright to the author Olivier BERTRAND 2014 - 2018 */ /* */ /* This file contains the JSON classes declares. */ /***********************************************************************/ -#include "osutil.h" +//#include "osutil.h" // Unuseful and bad for OEM #include "block.h" #include "colblk.h" #include "json.h" @@ -16,7 +16,7 @@ typedef class JSONDEF *PJDEF; typedef class TDBJSON *PJTDB; typedef class JSONCOL *PJCOL; class TDBJSN; -PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info); +DllExport PQRYRES JSONColumns(PGLOBAL, PCSZ, PCSZ, PTOS, bool); /***********************************************************************/ /* The JSON tree node. Can be an Object or an Array. */ |