summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2020-01-16 15:59:00 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2020-01-16 15:59:00 +0100
commit33825df108e2a1c521015ddd5578f796569cd832 (patch)
tree47783946d56bb8a6216b1b6ae2ed0d78b1fc8815
parentdfaab4ae9004fa636bb11fdc4846a11a16e81ebb (diff)
Don't include 'src/flstring.h' in menubar demo
src/flstring.h should only be used in library code because it includes <config.h>. Document this fact in src/flstring.h.
-rw-r--r--src/flstring.h11
-rw-r--r--test/menubar.cxx3
2 files changed, 11 insertions, 3 deletions
diff --git a/src/flstring.h b/src/flstring.h
index da242b3d4..3dc75165e 100644
--- a/src/flstring.h
+++ b/src/flstring.h
@@ -2,8 +2,9 @@
* "$Id$"
*
* Common string header file for the Fast Light Tool Kit (FLTK).
+ * Internal use only (see "important note" below).
*
- * Copyright 1998-2018 by Bill Spitzak and others.
+ * Copyright 1998-2020 by Bill Spitzak and others.
*
* This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this
@@ -16,6 +17,14 @@
* http://www.fltk.org/str.php
*/
+ /*
+ * Important note: this header file includes '<config.h>' !
+ *
+ * This header MUST NOT be included in public headers (i.e. in 'FL/') and
+ * SHOULD NOT be included in test and demo programs (i.e. in 'test/' or
+ * 'examples/') because it includes '<config.h>'.
+ */
+
#ifndef flstring_h
# define flstring_h
diff --git a/test/menubar.cxx b/test/menubar.cxx
index 438709e6b..2dca71707 100644
--- a/test/menubar.cxx
+++ b/test/menubar.cxx
@@ -3,7 +3,7 @@
//
// Menubar test program for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -29,7 +29,6 @@
#include <FL/Fl_Value_Slider.H>
#include <stdio.h>
#include <stdlib.h>
-#include "../src/flstring.h"
#include <FL/fl_draw.H>
#include <FL/Fl_Simple_Terminal.H>
#include <FL/fl_ask.H>