summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-16 20:02:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:32 -0500
commitecf0dd6bafaa95692c3ece94b6f71446cd54ebdc (patch)
treea71646d5f1554d33dc21130fe1a99a4e9e1938b9 /source4/lib
parentd3087451c4ec25171ba956fe2cd4e1d0f64f7edc (diff)
downloadsamba-ecf0dd6bafaa95692c3ece94b6f71446cd54ebdc.tar.gz
samba-ecf0dd6bafaa95692c3ece94b6f71446cd54ebdc.tar.bz2
samba-ecf0dd6bafaa95692c3ece94b6f71446cd54ebdc.zip
r14488: Install more headers.
Generate different #include lines in pidl depending on whether we're building inside or outside of the Samba tree (useful for 3rd-party projects). (This used to be commit 0c188833154c1fe565cb1735909e408a4a1a6049)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/charset/charset.h5
-rw-r--r--source4/lib/charset/config.mk3
2 files changed, 7 insertions, 1 deletions
diff --git a/source4/lib/charset/charset.h b/source4/lib/charset/charset.h
index 5ad2f431bf..df67aebb55 100644
--- a/source4/lib/charset/charset.h
+++ b/source4/lib/charset/charset.h
@@ -19,6 +19,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef __CHARSET_H__
+#define __CHARSET_H__
+
/* this defines the charset types used in samba */
typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t;
@@ -67,3 +70,5 @@ typedef struct {
#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */
#include "lib/charset/charset_proto.h"
+
+#endif /* __CHARSET_H__ */
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index a69bee1ec3..5f423b3ba6 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -4,7 +4,8 @@
OBJ_FILES = \
iconv.o \
charcnv.o
-PRIVATE_PROTO_HEADER = charset_proto.h
+PUBLIC_HEADERS = charset.h
+PUBLIC_PROTO_HEADER = charset_proto.h
REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
# End SUBSYSTEM CHARSET
################################################