Bluetooth: Highlight correct bytes in some SDP trees (Part 2). Bug 8700 (https:...

[metze/wireshark/wip.git] / globals.h

diff --git a/globals.h b/globals.h
index d920fba1a25417a650fda4eb859194a71c964c80..32ce6fea503eff69c419996ca4affd5ca99fc17d 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __GLOBALS_H__
@@ -28,10 +28,14 @@
 #include "file.h"
 #include <epan/timestamp.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 extern capture_file cfile;
-#ifdef HAVE_LIBPCAP
-/** @todo move this to the gtk dir */
-extern gboolean     auto_scroll_live;
-#endif
 
-#endif
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GLOBALS_H__ */